netbird/easyjson
0
0
Fork 0
mirror of https://github.com/netbirdio/easyjson.git synced 2026-05-22 18:44:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Better support for custom interfaces. Bring all of the original checks back

Browse Source
This commit is contained in:
Timur
2019-03-23 13:02:58 +03:00
parent 63896f4315
commit 82d245f54e
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gen/decoder.go
+12 -6
View File
@@ -86,7 +86,7 @@ func (g *Generator) genTypeDecoder(t reflect.Type, out string, tags fieldTags, i
return err
}
// returns true of the type t implements one of the custom unmarshaler interfaces
// returns true if the type t implements one of the custom unmarshaler interfaces
func hasCustomUnmarshaler(t reflect.Type) bool {
t = reflect.PtrTo(t)
return t.Implements(reflect.TypeOf((*easyjson.Unmarshaler)(nil)).Elem()) ||
@@ -258,6 +258,7 @@ func (g *Generator) genTypeDecoderNoCheck(t reflect.Type, out string, tags field
fmt.Fprintln(g.out, ws+"}")
case reflect.Interface:
fmt.Printf("//%v: %v", out, g.interfaceIsEasyjsonUnmarshaller(t))
if t.NumMethod() != 0 {
if g.interfaceIsEasyjsonUnmarshaller(t) {
fmt.Fprintln(g.out, ws+out+".UnmarshalEasyJSON(in)")
@@ -266,8 +267,15 @@ func (g *Generator) genTypeDecoderNoCheck(t reflect.Type, out string, tags field
} else {
return fmt.Errorf("interface type %v not supported: only interface{} and easyjson/json Unmarshaler are allowed", t)
}
} else {
fmt.Fprintln(g.out, ws+"if m, ok := "+out+".(easyjson.Unmarshaler); ok {")
fmt.Fprintln(g.out, ws+"m.UnmarshalEasyJSON(in)")
fmt.Fprintln(g.out, ws+"} else if m, ok := "+out+".(json.Unmarshaler); ok {")
fmt.Fprintln(g.out, ws+"_ = m.UnmarshalJSON(in.Raw())")
fmt.Fprintln(g.out, ws+"} else {")
fmt.Fprintln(g.out, ws+" "+out+" = in.Interface()")
fmt.Fprintln(g.out, ws+"}")
}
fmt.Fprintln(g.out, ws+out+" = in.Interface()")
default:
return fmt.Errorf("don't know how to decode %v", t)
}
@@ -276,13 +284,11 @@ func (g *Generator) genTypeDecoderNoCheck(t reflect.Type, out string, tags field
}
func (g *Generator) interfaceIsEasyjsonUnmarshaller(t reflect.Type) bool {
unmarshalerType := reflect.TypeOf((*easyjson.Unmarshaler)(nil))
return t.Implements(unmarshalerType)
return t.Implements(reflect.TypeOf((*easyjson.Unmarshaler)(nil)).Elem())
}
func (g *Generator) interfaceIsJsonUnmarshaller(t reflect.Type) bool {
unmarshalerType := reflect.TypeOf((*json.Unmarshaler)(nil))
return t.Implements(unmarshalerType)
return t.Implements(reflect.TypeOf((*json.Unmarshaler)(nil)).Elem())
}
func (g *Generator) genStructFieldDecoder(t reflect.Type, f reflect.StructField) error {
gen/encoder.go
+16 -8
View File
@@ -110,7 +110,7 @@ func (g *Generator) genTypeEncoder(t reflect.Type, in string, tags fieldTags, in
return err
}
// returns true of the type t implements one of the custom marshaler interfaces
// returns true if the type t implements one of the custom marshaler interfaces
func hasCustomMarshaler(t reflect.Type) bool {
t = reflect.PtrTo(t)
return t.Implements(reflect.TypeOf((*easyjson.Marshaler)(nil)).Elem()) ||
@@ -245,13 +245,23 @@ func (g *Generator) genTypeEncoderNoCheck(t reflect.Type, in string, tags fieldT
if t.NumMethod() != 0 {
if g.interfaceIsEasyjsonMarshaller(t) {
fmt.Fprintln(g.out, ws+in+".MarshalEasyJSON(out)")
} else if g.interfaceIsJsonMarshaller(t) {
} else if g.interfaceIsJSONMarshaller(t) {
fmt.Fprintln(g.out, ws+"if m, ok := "+in+".(easyjson.Marshaler); ok {")
fmt.Fprintln(g.out, ws+" m.MarshalEasyJSON(out)")
fmt.Fprintln(g.out, ws+"} else {")
fmt.Fprintln(g.out, ws+in+".MarshalJSON(out)")
fmt.Fprintln(g.out, ws+"}")
} else {
return fmt.Errorf("interface type %v not supported: only interface{} was allowed", t)
return fmt.Errorf("interface type %v not supported: only interface{} and interfaces that implement json or easyjson Marshaling are allowed", t)
}
}
fmt.Fprintln(g.out, ws+"if m, ok := "+in+".(easyjson.Marshaler); ok {")
fmt.Fprintln(g.out, ws+" m.MarshalEasyJSON(out)")
fmt.Fprintln(g.out, ws+"} else if m, ok := "+in+".(json.Marshaler); ok {")
fmt.Fprintln(g.out, ws+" out.Raw(m.MarshalJSON())")
fmt.Fprintln(g.out, ws+"} else {")
fmt.Fprintln(g.out, ws+" out.Raw(json.Marshal("+in+"))")
fmt.Fprintln(g.out, ws+"}")
default:
return fmt.Errorf("don't know how to encode %v", t)
}
@@ -259,13 +269,11 @@ func (g *Generator) genTypeEncoderNoCheck(t reflect.Type, in string, tags fieldT
}
func (g *Generator) interfaceIsEasyjsonMarshaller(t reflect.Type) bool {
marshalerType := reflect.TypeOf((*easyjson.Marshaler)(nil))
return t.Implements(marshalerType)
return t.Implements(reflect.TypeOf((*easyjson.Marshaler)(nil)).Elem())
}
func (g *Generator) interfaceIsJsonMarshaller(t reflect.Type) bool {
marshalerType := reflect.TypeOf((*json.Marshaler)(nil))
return t.Implements(marshalerType)
func (g *Generator) interfaceIsJSONMarshaller(t reflect.Type) bool {
return t.Implements(reflect.TypeOf((*json.Marshaler)(nil)).Elem())
}
func (g *Generator) notEmptyCheck(t reflect.Type, v string) string {