update for latest micro

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
2021-09-22 02:22:22 +03:00
parent dffa65f291
commit 7125b0c2c4
3 changed files with 22 additions and 15 deletions

View File

@@ -9,20 +9,27 @@ import (
"google.golang.org/protobuf/proto"
)
type protoCodec struct{}
type protoCodec struct {
opts codec.Options
}
const (
flattenTag = "flatten"
)
func (c *protoCodec) Marshal(v interface{}) ([]byte, error) {
func (c *protoCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) {
switch m := v.(type) {
case nil:
return nil, nil
case *codec.Frame:
return m.Data, nil
case proto.Message:
if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil {
options := c.opts
for _, o := range opts {
o(&options)
}
if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
if nm, ok := nv.(proto.Message); ok {
m = nm
}
@@ -32,7 +39,7 @@ func (c *protoCodec) Marshal(v interface{}) ([]byte, error) {
return nil, codec.ErrInvalidMessage
}
func (c *protoCodec) Unmarshal(d []byte, v interface{}) error {
func (c *protoCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) error {
if len(d) == 0 {
return nil
}
@@ -42,7 +49,12 @@ func (c *protoCodec) Unmarshal(d []byte, v interface{}) error {
case *codec.Frame:
m.Data = d
case proto.Message:
if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil {
options := c.opts
for _, o := range opts {
o(&options)
}
if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
if nm, ok := nv.(proto.Message); ok {
m = nm
}
@@ -89,6 +101,6 @@ func (c *protoCodec) String() string {
return "proto"
}
func NewCodec() codec.Codec {
return &protoCodec{}
func NewCodec(opts ...codec.Option) codec.Codec {
return &protoCodec{opts: codec.NewOptions(opts...)}
}