Skip to content

Commit

Permalink
add exact unmarshal (#245)
Browse files Browse the repository at this point in the history
  • Loading branch information
xiejingru authored Mar 25, 2021
1 parent 56c0cdb commit f9e0a9d
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 0 deletions.
19 changes: 19 additions & 0 deletions spec/v1/lazy_value.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package v1

import (
"bytes"
"encoding/json"
)

Expand Down Expand Up @@ -48,3 +49,21 @@ func (v *LazyValue) Unmarshal(obj interface{}) error {
}
return nil
}

func (v *LazyValue) ExactUnmarshal(obj interface{}) error {
if v.doc != nil {
decoder := json.NewDecoder(bytes.NewReader(v.doc))
decoder.UseNumber()
return decoder.Decode(obj)
}
if v.Value != nil {
bs, err := json.Marshal(v.Value)
if err != nil {
return err
}
decoder := json.NewDecoder(bytes.NewReader(bs))
decoder.UseNumber()
return decoder.Decode(obj)
}
return nil
}
32 changes: 32 additions & 0 deletions spec/v1/lazy_value_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,36 @@ func TestSpecV1_LazyValue(t *testing.T) {
data4, err := json.Marshal(msg3)
assert.NoError(t, err)
assert.Equal(t, expData, string(data4))

i64 := int64(-1958835689816845425)
s := "test"
b := true
msg4 := &Message{
Kind: MessageReport,
Content: LazyValue{Value: map[string]interface{}{"int64": i64, "string": s, "bool": b}},
}
data5, err := json.Marshal(msg4)
assert.NoError(t, err)
var res Message
err = json.Unmarshal(data5, &res)
assert.NoError(t, err)
var im map[string]interface{}
err = res.Content.Unmarshal(&im)
assert.NoError(t, err)
resi := int64(im["int64"].(float64))
resb := im["bool"].(bool)
ress := im["string"].(string)
assert.NotEqual(t, resi, i64)
assert.Equal(t, resb, b)
assert.Equal(t, ress, s)

err = res.Content.ExactUnmarshal(&im)
assert.NoError(t, err)
resi, err = im["int64"].(json.Number).Int64()
resb = im["bool"].(bool)
ress = im["string"].(string)
assert.NoError(t, err)
assert.Equal(t, resi, i64)
assert.Equal(t, resb, b)
assert.Equal(t, ress, s)
}

0 comments on commit f9e0a9d

Please sign in to comment.