From 047c791f3b0c94870386f7ea12d5e3f2e2c30b69 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Wed, 22 Sep 2021 02:17:04 +0300 Subject: [PATCH] update for latest micro Signed-off-by: Vasiliy Tolstov --- go.mod | 2 +- go.sum | 9 ++------- jsonpb.go | 44 +++++++++++++++++++++++++++++++++++--------- options.go | 18 ++++++++++++++++++ 4 files changed, 56 insertions(+), 17 deletions(-) create mode 100644 options.go diff --git a/go.mod b/go.mod index 1d8e5f4..86ecf2d 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/unistack-org/micro-codec-jsonpb/v3 go 1.16 require ( - github.com/unistack-org/micro/v3 v3.7.1 + github.com/unistack-org/micro/v3 v3.7.3 google.golang.org/protobuf v1.27.1 ) diff --git a/go.sum b/go.sum index 53cb460..18df2a3 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= @@ -6,14 +5,11 @@ github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/unistack-org/micro-proto v0.0.9 h1:KrWLS4FUX7UAWNAilQf70uad6ZPf/0EudeddCXllRVc= github.com/unistack-org/micro-proto v0.0.9/go.mod h1:Cckwmzd89gvS7ThxzZp9kQR/EOdksFQcsTAtDDyKwrg= -github.com/unistack-org/micro/v3 v3.7.1 h1:gjCon1U8i9upNgw9+iEgbZh2LCeBizDYotQ+THHV0lo= -github.com/unistack-org/micro/v3 v3.7.1/go.mod h1:gBoY6gvzeFiJTZ4FgDttGNSs4Y1+1PRg2cV1yTRMSlg= +github.com/unistack-org/micro/v3 v3.7.3 h1:7dCv7WuTYp47jZ/doVCXDNMnY75imprbmwSnmchTSJY= +github.com/unistack-org/micro/v3 v3.7.3/go.mod h1:78vy7ggElJD+ayx8ruhJsY+SkGUupfR32LXrg1UObvg= golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -27,4 +23,3 @@ google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+Rur google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/jsonpb.go b/jsonpb.go index 84dde45..7fb0653 100644 --- a/jsonpb.go +++ b/jsonpb.go @@ -11,26 +11,28 @@ import ( ) var ( - JsonpbMarshaler = jsonpb.MarshalOptions{ + DefaultMarshalOptions = jsonpb.MarshalOptions{ UseEnumNumbers: false, EmitUnpopulated: false, UseProtoNames: true, AllowPartial: false, } - JsonpbUnmarshaler = jsonpb.UnmarshalOptions{ + DefaultUnmarshalOptions = jsonpb.UnmarshalOptions{ DiscardUnknown: false, AllowPartial: false, } ) -type jsonpbCodec struct{} +type jsonpbCodec struct { + opts codec.Options +} const ( flattenTag = "flatten" ) -func (c *jsonpbCodec) Marshal(v interface{}) ([]byte, error) { +func (c *jsonpbCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) { switch m := v.(type) { case nil: return nil, nil @@ -42,12 +44,24 @@ func (c *jsonpbCodec) Marshal(v interface{}) ([]byte, error) { m = nm } } - return JsonpbMarshaler.Marshal(m) + options := c.opts + for _, o := range opts { + o(&options) + } + + marshalOptions := DefaultMarshalOptions + if options.Context != nil { + if f, ok := options.Context.Value(marshalOptionsKey{}).(jsonpb.MarshalOptions); ok { + marshalOptions = f + } + } + + return marshalOptions.Marshal(m) } return nil, codec.ErrInvalidMessage } -func (c *jsonpbCodec) Unmarshal(d []byte, v interface{}) error { +func (c *jsonpbCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) error { if len(d) == 0 { return nil } @@ -63,7 +77,19 @@ func (c *jsonpbCodec) Unmarshal(d []byte, v interface{}) error { m = nm } } - return JsonpbUnmarshaler.Unmarshal(d, m) + + options := c.opts + for _, o := range opts { + o(&options) + } + + unmarshalOptions := DefaultUnmarshalOptions + if options.Context != nil { + if f, ok := options.Context.Value(unmarshalOptionsKey{}).(jsonpb.UnmarshalOptions); ok { + unmarshalOptions = f + } + } + return unmarshalOptions.Unmarshal(d, m) } return codec.ErrInvalidMessage } @@ -104,6 +130,6 @@ func (c *jsonpbCodec) String() string { return "jsonpb" } -func NewCodec() codec.Codec { - return &jsonpbCodec{} +func NewCodec(opts ...codec.Option) codec.Codec { + return &jsonpbCodec{opts: codec.NewOptions(opts...)} } diff --git a/options.go b/options.go new file mode 100644 index 0000000..6e86d46 --- /dev/null +++ b/options.go @@ -0,0 +1,18 @@ +package jsonpb + +import ( + codec "github.com/unistack-org/micro/v3/codec" + jsonpb "google.golang.org/protobuf/encoding/protojson" +) + +type unmarshalOptionsKey struct{} + +func UnmarshalOptions(o jsonpb.UnmarshalOptions) codec.Option { + return codec.SetOption(unmarshalOptionsKey{}, o) +} + +type marshalOptionsKey struct{} + +func MarshalOptions(o jsonpb.MarshalOptions) codec.Option { + return codec.SetOption(marshalOptionsKey{}, o) +}