mirror of
https://github.com/gin-gonic/gin.git
synced 2025-10-14 12:12:12 +08:00
feat(form): support BindUnmarshaler slice elements
gin-gonic#4312
This commit is contained in:
parent
dab5944a7b
commit
d905a35c21
@ -183,8 +183,15 @@ type BindUnmarshaler interface {
|
|||||||
// If the value implements the BindUnmarshaler interface, it will be used to set the value, we will return `true`
|
// If the value implements the BindUnmarshaler interface, it will be used to set the value, we will return `true`
|
||||||
// to skip the default value setting.
|
// to skip the default value setting.
|
||||||
func trySetCustom(val string, value reflect.Value) (isSet bool, err error) {
|
func trySetCustom(val string, value reflect.Value) (isSet bool, err error) {
|
||||||
switch v := value.Addr().Interface().(type) {
|
if value.Kind() != reflect.Ptr {
|
||||||
|
value = value.Addr()
|
||||||
|
}
|
||||||
|
switch value.Interface().(type) {
|
||||||
case BindUnmarshaler:
|
case BindUnmarshaler:
|
||||||
|
if !value.Elem().IsValid() {
|
||||||
|
value.Set(reflect.New(value.Type().Elem()))
|
||||||
|
}
|
||||||
|
v := value.Interface().(BindUnmarshaler)
|
||||||
return true, v.UnmarshalParam(val)
|
return true, v.UnmarshalParam(val)
|
||||||
}
|
}
|
||||||
return false, nil
|
return false, nil
|
||||||
@ -449,6 +456,13 @@ func setTimeField(val string, structField reflect.StructField, value reflect.Val
|
|||||||
|
|
||||||
func setArray(vals []string, value reflect.Value, field reflect.StructField) error {
|
func setArray(vals []string, value reflect.Value, field reflect.StructField) error {
|
||||||
for i, s := range vals {
|
for i, s := range vals {
|
||||||
|
if ok, err := trySetCustom(s, value.Index(i)); ok {
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
} else {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
err := setWithProperType(s, value.Index(i), field)
|
err := setWithProperType(s, value.Index(i), field)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -550,6 +550,54 @@ func TestMappingCustomPointerStructTypeWithURITag(t *testing.T) {
|
|||||||
assert.Equal(t, "happiness", s.FileData.Name)
|
assert.Equal(t, "happiness", s.FileData.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestMappingCustomStructTypeSliceWithFormTag(t *testing.T) {
|
||||||
|
var s struct {
|
||||||
|
FileData []customUnmarshalParamType `form:"data"`
|
||||||
|
}
|
||||||
|
err := mappingByPtr(&s, formSource{"data": {`file:/foo:happiness`, `http:/bar:sadness`}}, "form")
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
assert.Equal(t, "file", s.FileData[0].Protocol)
|
||||||
|
assert.Equal(t, "/foo", s.FileData[0].Path)
|
||||||
|
assert.Equal(t, "happiness", s.FileData[0].Name)
|
||||||
|
|
||||||
|
assert.Equal(t, "http", s.FileData[1].Protocol)
|
||||||
|
assert.Equal(t, "/bar", s.FileData[1].Path)
|
||||||
|
assert.Equal(t, "sadness", s.FileData[1].Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMappingCustomStructTypeSliceWithURITag(t *testing.T) {
|
||||||
|
var s struct {
|
||||||
|
FileData []customUnmarshalParamType `uri:"data"`
|
||||||
|
}
|
||||||
|
err := mappingByPtr(&s, formSource{"data": {`file:/foo:happiness`, `http:/bar:sadness`}}, "uri")
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
assert.Equal(t, "file", s.FileData[0].Protocol)
|
||||||
|
assert.Equal(t, "/foo", s.FileData[0].Path)
|
||||||
|
assert.Equal(t, "happiness", s.FileData[0].Name)
|
||||||
|
|
||||||
|
assert.Equal(t, "http", s.FileData[1].Protocol)
|
||||||
|
assert.Equal(t, "/bar", s.FileData[1].Path)
|
||||||
|
assert.Equal(t, "sadness", s.FileData[1].Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMappingCustomPointerStructTypeSliceWithFormTag(t *testing.T) {
|
||||||
|
var s struct {
|
||||||
|
FileData []*customUnmarshalParamType `form:"data"`
|
||||||
|
}
|
||||||
|
err := mappingByPtr(&s, formSource{"data": {`file:/foo:happiness`, `http:/bar:sadness`}}, "form")
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
assert.Equal(t, "file", s.FileData[0].Protocol)
|
||||||
|
assert.Equal(t, "/foo", s.FileData[0].Path)
|
||||||
|
assert.Equal(t, "happiness", s.FileData[0].Name)
|
||||||
|
|
||||||
|
assert.Equal(t, "http", s.FileData[1].Protocol)
|
||||||
|
assert.Equal(t, "/bar", s.FileData[1].Path)
|
||||||
|
assert.Equal(t, "sadness", s.FileData[1].Name)
|
||||||
|
}
|
||||||
|
|
||||||
type customPath []string
|
type customPath []string
|
||||||
|
|
||||||
func (p *customPath) UnmarshalParam(param string) error {
|
func (p *customPath) UnmarshalParam(param string) error {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user