simplify

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

codec_test.go

@@ -0,0 +1,19 @@
+package jsonpb
+
+import (
+	"bytes"
+	"testing"
+)
+
+func TestReadBody(t *testing.T) {
+	t.Skip("skip without proto message")
+	s := &struct {
+		Name string
+	}{}
+	c := NewCodec()
+	b := bytes.NewReader(nil)
+	err := c.ReadBody(b, s)
+	if err != nil {
+		t.Fatal(err)
+	}
+}

go.mod

@@ -3,6 +3,6 @@ module github.com/unistack-org/micro-codec-jsonpb/v3
 go 1.16
 
 require (
-	github.com/unistack-org/micro/v3 v3.3.11
+	github.com/unistack-org/micro/v3 v3.3.19
 	google.golang.org/protobuf v1.26.0
 )

go.sum

@@ -7,13 +7,13 @@ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/unistack-org/micro/v3 v3.3.11 h1:Jr0gAw5lLqgddiHKQeWUOUeP6ZqgRhz52EA9zJ5MJ3U=
+github.com/unistack-org/micro/v3 v3.3.19 h1:x0bl4H+IZvdHHKfA8qMcox9W92+e7rtbqgRfQPoP79w=
-github.com/unistack-org/micro/v3 v3.3.11/go.mod h1:PPCt675o3HPcODFbJ4iRWPmQFAk1WQ+asQSOb/syq6U=
+github.com/unistack-org/micro/v3 v3.3.19/go.mod h1:LXmPfbJnJNvL0kQs8HfnkV3Wya2Wb+C7keVq++RCZnk=
-golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

jsonpb.go

@@ -3,9 +3,9 @@ package jsonpb
 
 import (
 	"io"
-	"io/ioutil"
 
 	"github.com/unistack-org/micro/v3/codec"
+	rutil "github.com/unistack-org/micro/v3/util/reflect"
 	jsonpb "google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
 )
@@ -26,6 +26,10 @@ var (
 
 type jsonpbCodec struct{}
 
+const (
+	flattenTag = "flatten"
+)
+
 func (c *jsonpbCodec) Marshal(v interface{}) ([]byte, error) {
 	switch m := v.(type) {
 	case nil:
@@ -33,13 +37,18 @@ func (c *jsonpbCodec) Marshal(v interface{}) ([]byte, error) {
 	case *codec.Frame:
 		return m.Data, nil
 	case proto.Message:
+		if nv, nerr := rutil.StructFieldByTag(m, codec.DefaultTagName, flattenTag); nerr == nil {
+			if nm, ok := nv.(proto.Message); ok {
+				m = nm
+			}
+		}
 		return JsonpbMarshaler.Marshal(m)
 	}
 	return nil, codec.ErrInvalidMessage
 }
 
 func (c *jsonpbCodec) Unmarshal(d []byte, v interface{}) error {
-	if d == nil {
+	if len(d) == 0 {
 		return nil
 	}
 	switch m := v.(type) {
@@ -49,46 +58,69 @@ func (c *jsonpbCodec) Unmarshal(d []byte, v interface{}) error {
 		m.Data = d
 		return nil
 	case proto.Message:
+		if nv, nerr := rutil.StructFieldByTag(m, codec.DefaultTagName, flattenTag); nerr == nil {
+			if nm, ok := nv.(proto.Message); ok {
+				m = nm
+			}
+		}
 		return JsonpbUnmarshaler.Unmarshal(d, m)
 	}
 	return codec.ErrInvalidMessage
 }
+
 func (c *jsonpbCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error {
 	return nil
 }
 
-func (c *jsonpbCodec) ReadBody(conn io.Reader, b interface{}) error {
+func (c *jsonpbCodec) ReadBody(conn io.Reader, v interface{}) error {
-	switch m := b.(type) {
+	switch m := v.(type) {
 	case nil:
 		return nil
 	case *codec.Frame:
-		buf, err := ioutil.ReadAll(conn)
+		buf, err := io.ReadAll(conn)
 		if err != nil {
 			return err
+		} else if len(buf) == 0 {
+			return nil
 		}
 		m.Data = buf
 		return nil
 	case proto.Message:
-		buf, err := ioutil.ReadAll(conn)
+		buf, err := io.ReadAll(conn)
 		if err != nil {
 			return err
+		} else if len(buf) == 0 {
+			return nil
+		}
+		if nv, nerr := rutil.StructFieldByTag(m, codec.DefaultTagName, flattenTag); nerr == nil {
+			if nm, ok := nv.(proto.Message); ok {
+				m = nm
+			}
 		}
 		return JsonpbUnmarshaler.Unmarshal(buf, m)
 	}
 	return codec.ErrInvalidMessage
 }
 
-func (c *jsonpbCodec) Write(conn io.Writer, m *codec.Message, b interface{}) error {
+func (c *jsonpbCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error {
-	switch m := b.(type) {
+	switch m := v.(type) {
 	case nil:
 		return nil
 	case *codec.Frame:
 		_, err := conn.Write(m.Data)
 		return err
 	case proto.Message:
+		if nv, nerr := rutil.StructFieldByTag(m, codec.DefaultTagName, flattenTag); nerr == nil {
+			if nm, ok := nv.(proto.Message); ok {
+				m = nm
+			}
+		}
+
 		buf, err := JsonpbMarshaler.Marshal(m)
 		if err != nil {
 			return err
+		} else if len(buf) == 0 {
+			return codec.ErrInvalidMessage
 		}
 		_, err = conn.Write(buf)
 		return err