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

tweaks

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2020-11-29 21:04:41 +03:00
parent c8d1ba8bf4
commit d8ade96c41
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jsonpb.go
View File

@ -6,7 +6,9 @@ import (
"io" "io"
"io/ioutil" "io/ioutil"
// nolint: staticcheck
oldjsonpb "github.com/golang/protobuf/jsonpb" oldjsonpb "github.com/golang/protobuf/jsonpb"
// nolint: staticcheck
oldproto "github.com/golang/protobuf/proto" oldproto "github.com/golang/protobuf/proto"
"github.com/unistack-org/micro/v3/codec" "github.com/unistack-org/micro/v3/codec"
jsonpb "google.golang.org/protobuf/encoding/protojson" jsonpb "google.golang.org/protobuf/encoding/protojson"
@ -39,10 +41,9 @@ var (
type jsonpbCodec struct{} type jsonpbCodec struct{}
func (c *jsonpbCodec) Marshal(v interface{}) ([]byte, error) { func (c *jsonpbCodec) Marshal(v interface{}) ([]byte, error) {
if v == nil {
return nil, nil
}
switch m := v.(type) { switch m := v.(type) {
case nil:
return nil, nil
case *codec.Frame: case *codec.Frame:
return m.Data, nil return m.Data, nil
case proto.Message: case proto.Message:
@ -55,10 +56,12 @@ func (c *jsonpbCodec) Marshal(v interface{}) ([]byte, error) {
} }
func (c *jsonpbCodec) Unmarshal(d []byte, v interface{}) error { func (c *jsonpbCodec) Unmarshal(d []byte, v interface{}) error {
if d == nil || v == nil { if d == nil {
return nil return nil
} }
switch m := v.(type) { switch m := v.(type) {
case nil:
return nil
case *codec.Frame: case *codec.Frame:
m.Data = d m.Data = d
return nil return nil
@ -74,10 +77,9 @@ func (c *jsonpbCodec) ReadHeader(conn io.ReadWriter, m *codec.Message, t codec.M
} }
func (c *jsonpbCodec) ReadBody(conn io.ReadWriter, b interface{}) error { func (c *jsonpbCodec) ReadBody(conn io.ReadWriter, b interface{}) error {
if b == nil {
return nil
}
switch m := b.(type) { switch m := b.(type) {
case nil:
return nil
case *codec.Frame: case *codec.Frame:
buf, err := ioutil.ReadAll(conn) buf, err := ioutil.ReadAll(conn)
if err != nil { if err != nil {
@ -98,10 +100,9 @@ func (c *jsonpbCodec) ReadBody(conn io.ReadWriter, b interface{}) error {
} }
func (c *jsonpbCodec) Write(conn io.ReadWriter, m *codec.Message, b interface{}) error { func (c *jsonpbCodec) Write(conn io.ReadWriter, m *codec.Message, b interface{}) error {
if b == nil {
return nil
}
switch m := b.(type) { switch m := b.(type) {
case nil:
return nil
case *codec.Frame: case *codec.Frame:
_, err := conn.Write(m.Data) _, err := conn.Write(m.Data)
return err return err