Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Propagate JSON unmarshal errors #8

Merged
merged 4 commits into from
Apr 11, 2018
Merged

Propagate JSON unmarshal errors #8

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9419482
Add specs
creasty Apr 11, 2018
c94070b
Fix
creasty Apr 11, 2018
1424dab
Tweak
creasty Apr 11, 2018
b518268
Add more spec
creasty Apr 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,22 @@ func Set(ptr interface{}) error {

for i := 0; i < t.NumField(); i++ {
if defaultVal := t.Field(i).Tag.Get(fieldName); defaultVal != "-" {
setField(v.Field(i), defaultVal)
if err := setField(v.Field(i), defaultVal); err != nil {
return err
}
}
}

return nil
}

func setField(field reflect.Value, defaultVal string) {
func setField(field reflect.Value, defaultVal string) error {
if !field.CanSet() {
return
return nil
}

if !shouldInitializeField(field.Kind(), defaultVal) {
return
return nil
}

if isInitialValue(field) {
Expand Down Expand Up @@ -116,20 +118,27 @@ func setField(field reflect.Value, defaultVal string) {
ref := reflect.New(field.Type())
ref.Elem().Set(reflect.MakeSlice(field.Type(), 0, 0))
if defaultVal != "" && defaultVal != "[]" {
json.Unmarshal([]byte(defaultVal), ref.Interface())
println(defaultVal)
if err := json.Unmarshal([]byte(defaultVal), ref.Interface()); err != nil {
return err
}
}
field.Set(ref.Elem().Convert(field.Type()))
case reflect.Map:
ref := reflect.New(field.Type())
ref.Elem().Set(reflect.MakeMap(field.Type()))
if defaultVal != "" && defaultVal != "{}" {
json.Unmarshal([]byte(defaultVal), ref.Interface())
if err := json.Unmarshal([]byte(defaultVal), ref.Interface()); err != nil {
return err
}
}
field.Set(ref.Elem().Convert(field.Type()))
case reflect.Struct:
ref := reflect.New(field.Type())
if defaultVal != "" && defaultVal != "{}" {
json.Unmarshal([]byte(defaultVal), ref.Interface())
if err := json.Unmarshal([]byte(defaultVal), ref.Interface()); err != nil {
return err
}
}
field.Set(ref.Elem())
case reflect.Ptr:
Expand All @@ -141,13 +150,17 @@ func setField(field reflect.Value, defaultVal string) {
case reflect.Ptr:
setField(field.Elem(), defaultVal)
callSetter(field.Interface())
default:
case reflect.Struct:
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, this was a bug. Luckily I've found it by the changes.

ref := reflect.New(field.Type())
ref.Elem().Set(field)
Set(ref.Interface())
if err := Set(ref.Interface()); err != nil {
return err
}
callSetter(ref.Interface())
field.Set(ref.Elem())
}

return nil
}

func isInitialValue(field reflect.Value) bool {
Expand Down
18 changes: 17 additions & 1 deletion defaults_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func TestInit(t *testing.T) {
}

if err := Set(sample); err != nil {
t.Fatalf("it should return an error: %v", err)
t.Fatalf("it should not return an error: %v", err)
}

if err := Set(1); err == nil {
Expand Down Expand Up @@ -272,6 +272,22 @@ func TestInit(t *testing.T) {
if len(sample.SliceWithJSON) == 0 || sample.SliceWithJSON[0] != "foo" {
t.Errorf("it should initialize slice with json")
}

t.Run("invalid json", func(t *testing.T) {
if err := Set(&struct {
I []int `default:"[!]"`
}{}); err == nil {
t.Errorf("it should return error")
}

if err := Set(&struct {
S struct {
I []int `default:"[!]"`
}
}{}); err == nil {
t.Errorf("it should return error")
}
})
})

t.Run("Setter interface", func(t *testing.T) {
Expand Down