unistack-org/micro-codec-json
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 16 Wiki Activity

simplify

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2021-05-26 00:27:32 +03:00
parent cd2e0c6b3b
commit b1264f5094
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
json.go
View File

@ -24,7 +24,7 @@ func (c *jsonCodec) Marshal(v interface{}) ([]byte, error) {
} }
if nv, err := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); err == nil { if nv, err := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); err == nil {
return json.Marshal(nv) v = nv
} }
return json.Marshal(v) return json.Marshal(v)
@ -43,7 +43,7 @@ func (c *jsonCodec) Unmarshal(b []byte, v interface{}) error {
} }
if nv, err := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); err == nil { if nv, err := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); err == nil {
return json.Unmarshal(b, nv) v = nv
} }
return json.Unmarshal(b, v) return json.Unmarshal(b, v)
@ -68,18 +68,18 @@ func (c *jsonCodec) ReadBody(conn io.Reader, v interface{}) error {
return nil return nil
} }
var err error buf, err := io.ReadAll(conn)
if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil { if err != nil {
err = json.NewDecoder(conn).Decode(nv) return err
} else { } else if len(buf) == 0 {
err = json.NewDecoder(conn).Decode(v)
}
if err == io.EOF {
return nil return nil
} }
return err if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil {
v = nv
}
return c.Unmarshal(buf, v)
} }
func (c *jsonCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error { func (c *jsonCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error {
@ -91,13 +91,16 @@ func (c *jsonCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error
return err return err
} }
var err error
if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil { if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil {
err = json.NewEncoder(conn).Encode(nv) v = nv
} else {
err = json.NewEncoder(conn).Encode(v)
} }
buf, err := c.Marshal(v)
if err != nil {
return err
}
_, err = conn.Write(buf)
return err return err
} }