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

Merge pull request #504 from magodo/json_pb_support

Browse Source 
unmarshal json with `jsonpb` if accepter is pb
This commit is contained in:
Asim Aslam 2019-06-09 08:57:55 +01:00 committed by GitHub
commit 7c4515d748
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
codec/json/json.go
View File

@ -5,6 +5,8 @@ import (
"encoding/json" "encoding/json"
"io" "io"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
"github.com/micro/go-micro/codec" "github.com/micro/go-micro/codec"
) )
@ -22,6 +24,9 @@ func (c *Codec) ReadBody(b interface{}) error {
if b == nil { if b == nil {
return nil return nil
} }
if pb, ok := b.(proto.Message); ok {
return jsonpb.UnmarshalNext(c.Decoder, pb)
}
return c.Decoder.Decode(b) return c.Decoder.Decode(b)
} }

6
codec/json/marshaler.go
View File

@ -2,6 +2,9 @@ package json
import ( import (
"encoding/json" "encoding/json"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
) )
type Marshaler struct{} type Marshaler struct{}
@ -11,6 +14,9 @@ func (j Marshaler) Marshal(v interface{}) ([]byte, error) {
} }
func (j Marshaler) Unmarshal(d []byte, v interface{}) 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) return json.Unmarshal(d, v)
} }