go/json-iterator
1
0
Fork 0
mirror of https://github.com/json-iterator/go.git synced 2025-10-31 00:07:40 +02:00
Code Issues Releases Activity

fix encoder/decoder cast issue

Browse Source
This commit is contained in:
Tao Wen
2017-06-20 17:01:21 +08:00
parent 85be06b145
commit ed79b1726e
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
feature_reflect_extension.go
View File

@@ -248,17 +248,6 @@ func describeStruct(cfg *frozenConfig, typ reflect.Type) (*StructDescriptor, err
Decoder: decoder, Decoder: decoder,
Encoder: encoder, Encoder: encoder,
} }
shouldOmitEmpty := false
for _, tagPart := range tagParts[1:] {
if tagPart == "omitempty" {
shouldOmitEmpty = true
} else if tagPart == "string" {
binding.Decoder = &stringModeDecoder{binding.Decoder}
binding.Encoder = &stringModeEncoder{binding.Encoder}
}
}
binding.Decoder = &structFieldDecoder{&field, binding.Decoder}
binding.Encoder = &structFieldEncoder{&field, binding.Encoder, shouldOmitEmpty}
bindings = append(bindings, binding) bindings = append(bindings, binding)
} }
} }
@@ -269,6 +258,20 @@ func describeStruct(cfg *frozenConfig, typ reflect.Type) (*StructDescriptor, err
for _, extension := range extensions { for _, extension := range extensions {
extension.UpdateStructDescriptor(structDescriptor) extension.UpdateStructDescriptor(structDescriptor)
} }
for _, binding := range structDescriptor.Fields {
shouldOmitEmpty := false
tagParts := strings.Split(binding.Field.Tag.Get("json"), ",")
for _, tagPart := range tagParts[1:] {
if tagPart == "omitempty" {
shouldOmitEmpty = true
} else if tagPart == "string" {
binding.Decoder = &stringModeDecoder{binding.Decoder}
binding.Encoder = &stringModeEncoder{binding.Encoder}
}
}
binding.Decoder = &structFieldDecoder{binding.Field, binding.Decoder}
binding.Encoder = &structFieldEncoder{binding.Field, binding.Encoder, shouldOmitEmpty}
}
return structDescriptor, nil return structDescriptor, nil
} }

23
jsoniter_customize_test.go
View File

@@ -137,41 +137,42 @@ func Test_customize_field_by_extension(t *testing.T) {
// should.Contains(str, `"field-2":"abc"`) // should.Contains(str, `"field-2":"abc"`)
//} //}
type ObjectImplementedMarshaler int type timeImplementedMarshaler time.Time
func (obj *ObjectImplementedMarshaler) MarshalJSON() ([]byte, error) { func (obj *timeImplementedMarshaler) MarshalJSON() ([]byte, error) {
return []byte(`"hello"`), nil seconds := time.Time(*obj).Unix()
return []byte(strconv.FormatInt(seconds, 10)), nil
} }
func Test_marshaler(t *testing.T) { func Test_marshaler(t *testing.T) {
type TestObject struct { type TestObject struct {
Field *ObjectImplementedMarshaler Field *timeImplementedMarshaler
} }
should := require.New(t) should := require.New(t)
val := ObjectImplementedMarshaler(100) val := timeImplementedMarshaler(time.Unix(123, 0))
obj := TestObject{&val} obj := TestObject{&val}
bytes, err := json.Marshal(obj) bytes, err := json.Marshal(obj)
should.Nil(err) should.Nil(err)
should.Equal(`{"Field":"hello"}`, string(bytes)) should.Equal(`{"Field":123}`, string(bytes))
str, err := MarshalToString(obj) str, err := MarshalToString(obj)
should.Nil(err) should.Nil(err)
should.Equal(`{"Field":"hello"}`, str) should.Equal(`{"Field":123}`, str)
} }
func Test_marshaler_and_encoder(t *testing.T) { func Test_marshaler_and_encoder(t *testing.T) {
type TestObject struct { type TestObject struct {
Field *ObjectImplementedMarshaler Field *timeImplementedMarshaler
} }
ConfigDefault.cleanEncoders() ConfigDefault.cleanEncoders()
should := require.New(t) should := require.New(t)
RegisterTypeEncoderFunc("jsoniter.ObjectImplementedMarshaler", func(ptr unsafe.Pointer, stream *Stream) { RegisterTypeEncoderFunc("jsoniter.timeImplementedMarshaler", func(ptr unsafe.Pointer, stream *Stream) {
stream.WriteString("hello from encoder") stream.WriteString("hello from encoder")
}, nil) }, nil)
val := ObjectImplementedMarshaler(100) val := timeImplementedMarshaler(time.Unix(123, 0))
obj := TestObject{&val} obj := TestObject{&val}
bytes, err := json.Marshal(obj) bytes, err := json.Marshal(obj)
should.Nil(err) should.Nil(err)
should.Equal(`{"Field":"hello"}`, string(bytes)) should.Equal(`{"Field":123}`, string(bytes))
str, err := MarshalToString(obj) str, err := MarshalToString(obj)
should.Nil(err) should.Nil(err)
should.Equal(`{"Field":"hello from encoder"}`, str) should.Equal(`{"Field":"hello from encoder"}`, str)