unistack-org/micro-codec-jsonpb
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 18 Wiki Activity

simplify

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2021-05-26 00:32:11 +03:00
parent 858003c4b9
commit 032a9d5823
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jsonpb.go
View File

@ -39,7 +39,7 @@ func (c *jsonpbCodec) Marshal(v interface{}) ([]byte, error) {
case proto.Message: case proto.Message:
if nv, nerr := rutil.StructFieldByTag(m, codec.DefaultTagName, flattenTag); nerr == nil { if nv, nerr := rutil.StructFieldByTag(m, codec.DefaultTagName, flattenTag); nerr == nil {
if nm, ok := nv.(proto.Message); ok { if nm, ok := nv.(proto.Message); ok {
return JsonpbMarshaler.Marshal(nm) m = nm
} }
} }
return JsonpbMarshaler.Marshal(m) return JsonpbMarshaler.Marshal(m)
@ -60,13 +60,14 @@ func (c *jsonpbCodec) Unmarshal(d []byte, v interface{}) error {
case proto.Message: case proto.Message:
if nv, nerr := rutil.StructFieldByTag(m, codec.DefaultTagName, flattenTag); nerr == nil { if nv, nerr := rutil.StructFieldByTag(m, codec.DefaultTagName, flattenTag); nerr == nil {
if nm, ok := nv.(proto.Message); ok { if nm, ok := nv.(proto.Message); ok {
return JsonpbUnmarshaler.Unmarshal(d, nm) m = nm
} }
} }
return JsonpbUnmarshaler.Unmarshal(d, m) return JsonpbUnmarshaler.Unmarshal(d, m)
} }
return codec.ErrInvalidMessage return codec.ErrInvalidMessage
} }
func (c *jsonpbCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error { func (c *jsonpbCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error {
return nil return nil
} }
@ -93,7 +94,7 @@ func (c *jsonpbCodec) ReadBody(conn io.Reader, v interface{}) error {
} }
if nv, nerr := rutil.StructFieldByTag(m, codec.DefaultTagName, flattenTag); nerr == nil { if nv, nerr := rutil.StructFieldByTag(m, codec.DefaultTagName, flattenTag); nerr == nil {
if nm, ok := nv.(proto.Message); ok { if nm, ok := nv.(proto.Message); ok {
return JsonpbUnmarshaler.Unmarshal(buf, nm) m = nm
} }
} }
return JsonpbUnmarshaler.Unmarshal(buf, m) return JsonpbUnmarshaler.Unmarshal(buf, m)
@ -109,15 +110,13 @@ func (c *jsonpbCodec) Write(conn io.Writer, m *codec.Message, v interface{}) err
_, err := conn.Write(m.Data) _, err := conn.Write(m.Data)
return err return err
case proto.Message: case proto.Message:
var buf []byte
var err error
if nv, nerr := rutil.StructFieldByTag(m, codec.DefaultTagName, flattenTag); nerr == nil { if nv, nerr := rutil.StructFieldByTag(m, codec.DefaultTagName, flattenTag); nerr == nil {
if nm, ok := nv.(proto.Message); ok { if nm, ok := nv.(proto.Message); ok {
buf, err = JsonpbMarshaler.Marshal(nm) m = nm
} }
} else {
buf, err = JsonpbMarshaler.Marshal(m)
} }
buf, err := JsonpbMarshaler.Marshal(m)
if err != nil { if err != nil {
return err return err
} else if len(buf) == 0 { } else if len(buf) == 0 {