unistack-org/micro
4
0
Fork 3
Code Issues 20 Pull Requests 1 Actions Packages Projects Releases 281 Wiki Activity

unmarshal json with jsonpb if accepter is pb

Browse Source
This commit is contained in:
magodo 2019-06-09 11:50:50 +08:00
parent 95b8147fa1
commit 3573ac818f
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
codec/json/json.go
View File

@ -5,6 +5,8 @@ import (
"encoding/json"
"io"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
"github.com/micro/go-micro/codec"
)
@ -12,6 +14,7 @@ type Codec struct {
Conn io.ReadWriteCloser
Encoder *json.Encoder
Decoder *json.Decoder
Unmarshaler *jsonpb.Unmarshaler
}
func (c *Codec) ReadHeader(m *codec.Message, t codec.MessageType) error {
@ -22,6 +25,9 @@ func (c *Codec) ReadBody(b interface{}) error {
if b == nil {
return nil
}
if pb, ok := b.(proto.Message); ok {
return c.Unmarshaler.UnmarshalNext(c.Decoder, pb)
}
return c.Decoder.Decode(b)
}
@ -45,5 +51,6 @@ func NewCodec(c io.ReadWriteCloser) codec.Codec {
Conn: c,
Decoder: json.NewDecoder(c),
Encoder: json.NewEncoder(c),
Unmarshaler: &jsonpb.Unmarshaler{},
}
}

6
codec/json/marshaler.go
View File

@ -2,6 +2,9 @@ package json
import (
"encoding/json"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
)
type Marshaler struct{}
@ -11,6 +14,9 @@ func (j Marshaler) Marshal(v interface{}) ([]byte, error) {
}
func (j Marshaler) Unmarshal(d []byte, v interface{}) error {
if pb, ok := v.(proto.Message); ok {
return jsonpb.UnmarshalString(string(d), pb)
}
return json.Unmarshal(d, v)
}