go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-03-17 21:07:54 +02:00
Code Issues Releases Activity

add protojson (#952)

Browse Source
This commit is contained in:
longxboy 2021-05-26 14:45:12 +08:00 committed by GitHub
parent eb958b2093
commit c1e5b1c17b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
encoding/json/json.go
View File

@ -5,11 +5,24 @@ import (
"reflect"
"github.com/go-kratos/kratos/v2/encoding"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
)
// Name is the name registered for the json codec.
const Name = "json"
var (
// MarshalOptions is a configurable JSON format marshaler.
MarshalOptions = protojson.MarshalOptions{
EmitUnpopulated: true,
}
// UnmarshalOptions is a configurable JSON format parser.
UnmarshalOptions = protojson.UnmarshalOptions{
DiscardUnknown: true,
}
)
func init() {
encoding.RegisterCodec(codec{})
}
@ -18,6 +31,9 @@ func init() {
type codec struct{}
func (codec) Marshal(v interface{}) ([]byte, error) {
if m, ok := v.(proto.Message); ok {
return MarshalOptions.Marshal(m)
}
return json.Marshal(v)
}
@ -29,6 +45,11 @@ func (codec) Unmarshal(data []byte, v interface{}) error {
}
rv = rv.Elem()
}
if m, ok := v.(proto.Message); ok {
return UnmarshalOptions.Unmarshal(data, m)
} else if m, ok := reflect.Indirect(reflect.ValueOf(v)).Interface().(proto.Message); ok {
return UnmarshalOptions.Unmarshal(data, m)
}
return json.Unmarshal(data, v)
}

1
examples/proto/echo_service_test.go
View File

@ -134,6 +134,7 @@ func testEchoClient(t *testing.T, addr string) {
if din.Body.ValueField.GetStringValue() != dout.Body.ValueField.GetStringValue() {
t.Fatalf("EchoPatch expected %s got %s", din, dout)
}
fmt.Println("echo test success!")
}
func TestJSON(t *testing.T) {