diff --git a/json.go b/json.go index 3741560a..5b2ef045 100644 --- a/json.go +++ b/json.go @@ -254,7 +254,7 @@ func addFileJSONLookup() { // encoding/json.RawMessage is a special case of []byte // it cannot be handled as a reflect.Array/reflect.Slice // because it needs additional structure in the output -func rJsonRawMessage(f *Faker, t reflect.Type, v reflect.Value, tag string, size int) error { +func rJsonRawMessage(f *Faker, v reflect.Value) error { b, err := f.JSON(nil) if err != nil { return err @@ -268,7 +268,7 @@ func rJsonRawMessage(f *Faker, t reflect.Type, v reflect.Value, tag string, size // that represents a JSON number literal. // It cannot be handled as a string because it needs to // represent an integer or a floating-point number. -func rJsonNumber(f *Faker, t reflect.Type, v reflect.Value, tag string, size int) error { +func rJsonNumber(f *Faker, v reflect.Value, tag string) error { var ret json.Number var numberType string diff --git a/lookup.go b/lookup.go index ea96ac6f..2b5af9b7 100644 --- a/lookup.go +++ b/lookup.go @@ -333,7 +333,7 @@ func (i *Info) GetField(m *MapParams, field string) (*Param, []string, error) { } return p, value, nil - } else if m == nil && p.Default != "" { + } else if p.Default != "" { // If p.Type is []uint, then we need to convert it to []string if strings.HasPrefix(p.Default, "[") { // Remove [] from type diff --git a/struct.go b/struct.go index 99d28cef..b203959d 100644 --- a/struct.go +++ b/struct.go @@ -39,9 +39,9 @@ func r(f *Faker, t reflect.Type, v reflect.Value, tag string, size int) error { switch t.Name() { case "RawMessage": - return rJsonRawMessage(f, t, v, tag, size) + return rJsonRawMessage(f, v) case "Number": - return rJsonNumber(f, t, v, tag, size) + return rJsonNumber(f, v, tag) default: return errors.New("unknown encoding/json type: " + t.Name()) } @@ -72,7 +72,7 @@ func r(f *Faker, t reflect.Type, v reflect.Value, tag string, size int) error { return nil } -func rCustom(f *Faker, t reflect.Type, v reflect.Value, tag string) error { +func rCustom(f *Faker, v reflect.Value, tag string) error { // If tag is empty return error if tag == "" { return errors.New("tag is empty") @@ -126,7 +126,7 @@ func rCustom(f *Faker, t reflect.Type, v reflect.Value, tag string) error { func rStruct(f *Faker, t reflect.Type, v reflect.Value, tag string) error { // Check if tag exists, if so run custom function if t.Name() != "" && tag != "" { - return rCustom(f, t, v, tag) + return rCustom(f, v, tag) } // Check if struct is fakeable @@ -252,7 +252,7 @@ func rSlice(f *Faker, t reflect.Type, v reflect.Value, tag string, size int) err // Check if tag exists, if so run custom function if t.Name() != "" && tag != "" { // Check to see if custom function works if not continue to normal loop of values - err := rCustom(f, t, v, tag) + err := rCustom(f, v, tag) if err == nil { return nil } @@ -308,7 +308,7 @@ func rMap(f *Faker, t reflect.Type, v reflect.Value, tag string, size int) error // Check if tag exists, if so run custom function if tag != "" { - return rCustom(f, t, v, tag) + return rCustom(f, v, tag) } else if size > 0 { // NOOP } else if isFakeable(t) {