unistack-org/micro-codec-urlencode
4
0
Fork 1
Code Issues Pull Requests Actions 1 Packages Projects Releases 12 Wiki Activity

fix codec.Frame in case of flatten struct tag

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2021-09-24 00:20:43 +03:00
parent c18a6376ec
commit cbcaf6edaf
4 changed files with 63 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
urlencode.go
View File

@@ -8,26 +8,34 @@ import (
rutil "github.com/unistack-org/micro/v3/util/reflect"
)
type urlencodeCodec struct{}
type urlencodeCodec struct {
opts codec.Options
}
var _ codec.Codec = &urlencodeCodec{}
const (
flattenTag = "flatten"
)
func (c *urlencodeCodec) Marshal(v interface{}) ([]byte, error) {
func (c *urlencodeCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) {
if v == nil {
return nil, nil
}
options := c.opts
for _, o := range opts {
o(&options)
}
if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
v = nv
}
if m, ok := v.(*codec.Frame); ok {
return m.Data, nil
}
if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil {
v = nv
}
uv, err := rutil.StructURLValues(v, "", []string{"protobuf", "json"})
uv, err := rutil.StructURLValues(v, "", []string{"protobuf", "json", "xml", "yaml"})
if err != nil {
return nil, err
}
@@ -35,11 +43,20 @@ func (c *urlencodeCodec) Marshal(v interface{}) ([]byte, error) {
return []byte(uv.Encode()), nil
}
func (c *urlencodeCodec) Unmarshal(b []byte, v interface{}) error {
func (c *urlencodeCodec) Unmarshal(b []byte, v interface{}, opts ...codec.Option) error {
if len(b) == 0 || v == nil {
return nil
}
options := c.opts
for _, o := range opts {
o(&options)
}
if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
v = nv
}
if m, ok := v.(*codec.Frame); ok {
m.Data = b
return nil
@@ -50,11 +67,7 @@ func (c *urlencodeCodec) Unmarshal(b []byte, v interface{}) error {
return err
}
if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil {
v = nv
}
return rutil.Merge(v, rutil.FlattenMap(mp), rutil.Tags([]string{"protobuf", "json"}), rutil.SliceAppend(true))
return rutil.Merge(v, rutil.FlattenMap(mp), rutil.Tags([]string{"protobuf", "json", "xml", "yaml"}), rutil.SliceAppend(true))
}
func (c *urlencodeCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error {
@@ -94,6 +107,6 @@ func (c *urlencodeCodec) String() string {
return "urlencode"
}
func NewCodec() codec.Codec {
return &urlencodeCodec{}
func NewCodec(opts ...codec.Option) *urlencodeCodec {
return &urlencodeCodec{opts: codec.NewOptions(opts...)}
}