diff --git a/util/gconv/gconv_converter_map.go b/util/gconv/gconv_converter_map.go index c79a802bd..02a08380e 100644 --- a/util/gconv/gconv_converter_map.go +++ b/util/gconv/gconv_converter_map.go @@ -30,9 +30,9 @@ type MapOption struct { // Tags specifies the converted map key name by struct tag name. Tags []string - // FailBreak specifies whether to break converting the next element + // BreakOnError specifies whether to break converting the next element // if one element conversion fails in map. - FailBreak bool + BreakOnError bool } // Map converts any variable `value` to map[string]any. If the parameter `value` is not a @@ -52,7 +52,7 @@ func (c *impConverter) MapStrStr(value any, option MapOption) (map[string]string return r, nil } m, err := c.Map(value, option) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } if len(m) > 0 { @@ -62,7 +62,7 @@ func (c *impConverter) MapStrStr(value any, option MapOption) (map[string]string ) for k, v := range m { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } vMap[k] = s @@ -127,7 +127,7 @@ func (c *impConverter) doMapConvert( recursiveOption.Tags = newTags for k, v := range r { s, err := c.String(k) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } dataMap[s], err = c.doMapConvertForMapOrStructValue( @@ -139,14 +139,14 @@ func (c *impConverter) doMapConvert( Option: recursiveOption, }, ) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } } case map[interface{}]string: for k, v := range r { s, err := c.String(k) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } dataMap[s] = v @@ -154,7 +154,7 @@ func (c *impConverter) doMapConvert( case map[interface{}]int: for k, v := range r { s, err := c.String(k) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } dataMap[s] = v @@ -162,7 +162,7 @@ func (c *impConverter) doMapConvert( case map[interface{}]uint: for k, v := range r { s, err := c.String(k) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } dataMap[s] = v @@ -170,7 +170,7 @@ func (c *impConverter) doMapConvert( case map[interface{}]float32: for k, v := range r { s, err := c.String(k) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } dataMap[s] = v @@ -178,7 +178,7 @@ func (c *impConverter) doMapConvert( case map[interface{}]float64: for k, v := range r { s, err := c.String(k) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } dataMap[s] = v @@ -222,7 +222,7 @@ func (c *impConverter) doMapConvert( Option: recursiveOption, }, ) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } } @@ -235,7 +235,7 @@ func (c *impConverter) doMapConvert( recursiveOption.Tags = newTags for k, v := range r { s, err := c.String(k) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } dataMap[s], err = c.doMapConvertForMapOrStructValue( @@ -247,14 +247,14 @@ func (c *impConverter) doMapConvert( Option: recursiveOption, }, ) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } } case map[int]string: for k, v := range r { s, err := c.String(k) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } dataMap[s] = v @@ -262,7 +262,7 @@ func (c *impConverter) doMapConvert( case map[uint]string: for k, v := range r { s, err := c.String(k) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } dataMap[s] = v @@ -291,7 +291,7 @@ func (c *impConverter) doMapConvert( length := reflectValue.Len() for i := 0; i < length; i += 2 { s, err := c.String(String(reflectValue.Index(i).Interface())) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } if i+1 < length { @@ -313,7 +313,7 @@ func (c *impConverter) doMapConvert( MustMapReturn: mustMapReturn, }, ) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } if m, ok := convertedValue.(map[string]interface{}); ok { @@ -390,7 +390,7 @@ func (c *impConverter) doMapConvertForMapOrStructValue(in doMapConvertForMapOrSt mapValue = mapKeyValue.Interface() } s, err := c.String(mapIter.Key().Interface()) - if err != nil && in.Option.FailBreak { + if err != nil && in.Option.BreakOnError { return nil, err } dataMap[s], err = c.doMapConvertForMapOrStructValue( @@ -402,7 +402,7 @@ func (c *impConverter) doMapConvertForMapOrStructValue(in doMapConvertForMapOrSt Option: in.Option, }, ) - if err != nil && in.Option.FailBreak { + if err != nil && in.Option.BreakOnError { return nil, err } } @@ -424,7 +424,7 @@ func (c *impConverter) doMapConvertForMapOrStructValue(in doMapConvertForMapOrSt Option: in.Option, }, ) - if err != nil && in.Option.FailBreak { + if err != nil && in.Option.BreakOnError { return nil, err } } else { @@ -518,7 +518,7 @@ func (c *impConverter) doMapConvertForMapOrStructValue(in doMapConvertForMapOrSt Option: in.Option, }, ) - if err != nil && in.Option.FailBreak { + if err != nil && in.Option.BreakOnError { return nil, err } if m, ok := anonymousValue.(map[string]interface{}); ok { @@ -540,7 +540,7 @@ func (c *impConverter) doMapConvertForMapOrStructValue(in doMapConvertForMapOrSt Option: in.Option, }, ) - if err != nil && in.Option.FailBreak { + if err != nil && in.Option.BreakOnError { return nil, err } @@ -554,7 +554,7 @@ func (c *impConverter) doMapConvertForMapOrStructValue(in doMapConvertForMapOrSt Option: in.Option, }, ) - if err != nil && in.Option.FailBreak { + if err != nil && in.Option.BreakOnError { return nil, err } } @@ -577,7 +577,7 @@ func (c *impConverter) doMapConvertForMapOrStructValue(in doMapConvertForMapOrSt Option: in.Option, }, ) - if err != nil && in.Option.FailBreak { + if err != nil && in.Option.BreakOnError { return nil, err } } @@ -589,7 +589,7 @@ func (c *impConverter) doMapConvertForMapOrStructValue(in doMapConvertForMapOrSt ) for mapIter.Next() { s, err := c.String(mapIter.Key().Interface()) - if err != nil && in.Option.FailBreak { + if err != nil && in.Option.BreakOnError { return nil, err } nestedMap[s], err = c.doMapConvertForMapOrStructValue( @@ -601,7 +601,7 @@ func (c *impConverter) doMapConvertForMapOrStructValue(in doMapConvertForMapOrSt Option: in.Option, }, ) - if err != nil && in.Option.FailBreak { + if err != nil && in.Option.BreakOnError { return nil, err } } @@ -642,7 +642,7 @@ func (c *impConverter) doMapConvertForMapOrStructValue(in doMapConvertForMapOrSt RecursiveOption: in.RecursiveType == recursiveTypeTrue, Option: in.Option, }) - if err != nil && in.Option.FailBreak { + if err != nil && in.Option.BreakOnError { return nil, err } } diff --git a/util/gconv/gconv_converter_slice_any.go b/util/gconv/gconv_converter_slice_any.go index d9d0c2a62..45ede7cff 100644 --- a/util/gconv/gconv_converter_slice_any.go +++ b/util/gconv/gconv_converter_slice_any.go @@ -16,9 +16,9 @@ import ( ) type SliceOption struct { - // FailBreak specifies whether to break converting the next element + // BreakOnError specifies whether to break converting the next element // if one element conversion fails in slice. - FailBreak bool + BreakOnError bool } // SliceAny converts `any` to []any. diff --git a/util/gconv/gconv_converter_slice_float.go b/util/gconv/gconv_converter_slice_float.go index 201e927f7..0bb93fd11 100644 --- a/util/gconv/gconv_converter_slice_float.go +++ b/util/gconv/gconv_converter_slice_float.go @@ -31,7 +31,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa array = make([]float32, len(value)) for k, v := range value { f, err = c.Float32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -40,7 +40,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa array = make([]float32, len(value)) for k, v := range value { f, err = c.Float32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -49,7 +49,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa array = make([]float32, len(value)) for k, v := range value { f, err = c.Float32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -58,7 +58,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa array = make([]float32, len(value)) for k, v := range value { f, err = c.Float32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -67,7 +67,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa array = make([]float32, len(value)) for k, v := range value { f, err = c.Float32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -76,7 +76,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa array = make([]float32, len(value)) for k, v := range value { f, err = c.Float32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -85,7 +85,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa array = make([]float32, len(value)) for k, v := range value { f, err = c.Float32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -99,7 +99,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa array = make([]float32, len(value)) for k, v := range value { f, err = c.Float32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -116,7 +116,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa } if utils.IsNumeric(value) { f, err = c.Float32(value) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []float32{f}, err @@ -125,7 +125,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa array = make([]float32, len(value)) for k, v := range value { f, err = c.Float32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -134,7 +134,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa array = make([]float32, len(value)) for k, v := range value { f, err = c.Float32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -143,7 +143,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa array = make([]float32, len(value)) for k, v := range value { f, err = c.Float32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -152,7 +152,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa array = make([]float32, len(value)) for k, v := range value { f, err = c.Float32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -163,7 +163,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa array = make([]float32, len(value)) for k, v := range value { f, err = c.Float32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -172,7 +172,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa array = make([]float32, len(value)) for k, v := range value { f, err = c.Float32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -197,7 +197,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa ) for i := 0; i < length; i++ { f, err = c.Float32(originValueAndKind.OriginValue.Index(i).Interface()) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } slice[i] = f @@ -209,7 +209,7 @@ func (c *impConverter) SliceFloat32(any interface{}, option SliceOption) ([]floa return []float32{}, err } f, err = c.Float32(any) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []float32{f}, err @@ -231,7 +231,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa array = make([]float64, len(value)) for k, v := range value { f, err = c.Float64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -240,7 +240,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa array = make([]float64, len(value)) for k, v := range value { f, err = c.Float64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -249,7 +249,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa array = make([]float64, len(value)) for k, v := range value { f, err = c.Float64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -258,7 +258,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa array = make([]float64, len(value)) for k, v := range value { f, err = c.Float64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -267,7 +267,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa array = make([]float64, len(value)) for k, v := range value { f, err = c.Float64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -276,7 +276,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa array = make([]float64, len(value)) for k, v := range value { f, err = c.Float64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -285,7 +285,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa array = make([]float64, len(value)) for k, v := range value { f, err = c.Float64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -299,7 +299,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa array = make([]float64, len(value)) for k, v := range value { f, err = c.Float64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -316,7 +316,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa } if utils.IsNumeric(value) { f, err = c.Float64(value) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []float64{f}, err @@ -325,7 +325,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa array = make([]float64, len(value)) for k, v := range value { f, err = c.Float64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -334,7 +334,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa array = make([]float64, len(value)) for k, v := range value { f, err = c.Float64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -343,7 +343,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa array = make([]float64, len(value)) for k, v := range value { f, err = c.Float64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -352,7 +352,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa array = make([]float64, len(value)) for k, v := range value { f, err = c.Float64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -361,7 +361,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa array = make([]float64, len(value)) for k, v := range value { f, err = c.Float64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -372,7 +372,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa array = make([]float64, len(value)) for k, v := range value { f, err = c.Float64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = f @@ -397,7 +397,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa ) for i := 0; i < length; i++ { f, err = c.Float64(originValueAndKind.OriginValue.Index(i).Interface()) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } slice[i] = f @@ -409,7 +409,7 @@ func (c *impConverter) SliceFloat64(any interface{}, option SliceOption) ([]floa return []float64{}, err } f, err = c.Float64(any) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []float64{f}, err diff --git a/util/gconv/gconv_converter_slice_int.go b/util/gconv/gconv_converter_slice_int.go index 4dcc6cc8d..437e36b55 100644 --- a/util/gconv/gconv_converter_slice_int.go +++ b/util/gconv/gconv_converter_slice_int.go @@ -31,7 +31,7 @@ func (c *impConverter) SliceInt(any any, option SliceOption) ([]int, error) { array = make([]int, len(value)) for k, v := range value { ii, err = c.Int(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -85,7 +85,7 @@ func (c *impConverter) SliceInt(any any, option SliceOption) ([]int, error) { } if utils.IsNumeric(value) { ii, err = c.Int(value) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []int{ii}, err @@ -118,7 +118,7 @@ func (c *impConverter) SliceInt(any any, option SliceOption) ([]int, error) { array = make([]int, len(value)) for k, v := range value { ii, err = c.Int(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -127,7 +127,7 @@ func (c *impConverter) SliceInt(any any, option SliceOption) ([]int, error) { array = make([]int, len(value)) for k, v := range value { ii, err = c.Int(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -136,7 +136,7 @@ func (c *impConverter) SliceInt(any any, option SliceOption) ([]int, error) { array = make([]int, len(value)) for k, v := range value { ii, err = c.Int(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -145,7 +145,7 @@ func (c *impConverter) SliceInt(any any, option SliceOption) ([]int, error) { array = make([]int, len(value)) for k, v := range value { ii, err = c.Int(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -170,7 +170,7 @@ func (c *impConverter) SliceInt(any any, option SliceOption) ([]int, error) { ) for i := 0; i < length; i++ { ii, err = c.Int(originValueAndKind.OriginValue.Index(i).Interface()) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } slice[i] = ii @@ -182,7 +182,7 @@ func (c *impConverter) SliceInt(any any, option SliceOption) ([]int, error) { return []int{}, err } ii, err = c.Int(any) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []int{ii}, err @@ -204,7 +204,7 @@ func (c *impConverter) SliceInt32(any any, option SliceOption) ([]int32, error) array = make([]int32, len(value)) for k, v := range value { ii, err = c.Int32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -258,7 +258,7 @@ func (c *impConverter) SliceInt32(any any, option SliceOption) ([]int32, error) } if utils.IsNumeric(value) { ii, err = c.Int32(value) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []int32{ii}, err @@ -291,7 +291,7 @@ func (c *impConverter) SliceInt32(any any, option SliceOption) ([]int32, error) array = make([]int32, len(value)) for k, v := range value { ii, err = c.Int32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -300,7 +300,7 @@ func (c *impConverter) SliceInt32(any any, option SliceOption) ([]int32, error) array = make([]int32, len(value)) for k, v := range value { ii, err = c.Int32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -309,7 +309,7 @@ func (c *impConverter) SliceInt32(any any, option SliceOption) ([]int32, error) array = make([]int32, len(value)) for k, v := range value { ii, err = c.Int32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -318,7 +318,7 @@ func (c *impConverter) SliceInt32(any any, option SliceOption) ([]int32, error) array = make([]int32, len(value)) for k, v := range value { ii, err = c.Int32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -343,7 +343,7 @@ func (c *impConverter) SliceInt32(any any, option SliceOption) ([]int32, error) ) for i := 0; i < length; i++ { ii, err = c.Int32(originValueAndKind.OriginValue.Index(i).Interface()) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } slice[i] = ii @@ -355,7 +355,7 @@ func (c *impConverter) SliceInt32(any any, option SliceOption) ([]int32, error) return []int32{}, err } ii, err = c.Int32(any) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []int32{ii}, err @@ -377,7 +377,7 @@ func (c *impConverter) SliceInt64(any any, option SliceOption) ([]int64, error) array = make([]int64, len(value)) for k, v := range value { ii, err = c.Int64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -431,7 +431,7 @@ func (c *impConverter) SliceInt64(any any, option SliceOption) ([]int64, error) } if utils.IsNumeric(value) { ii, err = c.Int64(value) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []int64{ii}, err @@ -464,7 +464,7 @@ func (c *impConverter) SliceInt64(any any, option SliceOption) ([]int64, error) array = make([]int64, len(value)) for k, v := range value { ii, err = c.Int64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -473,7 +473,7 @@ func (c *impConverter) SliceInt64(any any, option SliceOption) ([]int64, error) array = make([]int64, len(value)) for k, v := range value { ii, err = c.Int64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -482,7 +482,7 @@ func (c *impConverter) SliceInt64(any any, option SliceOption) ([]int64, error) array = make([]int64, len(value)) for k, v := range value { ii, err = c.Int64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -491,7 +491,7 @@ func (c *impConverter) SliceInt64(any any, option SliceOption) ([]int64, error) array = make([]int64, len(value)) for k, v := range value { ii, err = c.Int64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ii @@ -516,7 +516,7 @@ func (c *impConverter) SliceInt64(any any, option SliceOption) ([]int64, error) ) for i := 0; i < length; i++ { ii, err = c.Int64(originValueAndKind.OriginValue.Index(i).Interface()) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } slice[i] = ii @@ -528,7 +528,7 @@ func (c *impConverter) SliceInt64(any any, option SliceOption) ([]int64, error) return []int64{}, err } ii, err = c.Int64(any) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []int64{ii}, err diff --git a/util/gconv/gconv_converter_slice_str.go b/util/gconv/gconv_converter_slice_str.go index 5f454b0eb..ff8734e7d 100644 --- a/util/gconv/gconv_converter_slice_str.go +++ b/util/gconv/gconv_converter_slice_str.go @@ -30,7 +30,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, array = make([]string, len(value)) for k, v := range value { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = s @@ -44,7 +44,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, array = make([]string, len(value)) for k, v := range value { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = s @@ -53,7 +53,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, array = make([]string, len(value)) for k, v := range value { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = s @@ -62,7 +62,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, array = make([]string, len(value)) for k, v := range value { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = s @@ -71,7 +71,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, array = make([]string, len(value)) for k, v := range value { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = s @@ -85,7 +85,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, array = make([]string, len(value)) for k, v := range value { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = s @@ -106,7 +106,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, array = make([]string, len(value)) for k, v := range value { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = s @@ -115,7 +115,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, array = make([]string, len(value)) for k, v := range value { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = s @@ -124,7 +124,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, array = make([]string, len(value)) for k, v := range value { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = s @@ -133,7 +133,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, array = make([]string, len(value)) for k, v := range value { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = s @@ -142,7 +142,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, array = make([]string, len(value)) for k, v := range value { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = s @@ -151,7 +151,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, array = make([]string, len(value)) for k, v := range value { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = s @@ -160,7 +160,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, array = make([]string, len(value)) for k, v := range value { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = s @@ -171,7 +171,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, array = make([]string, len(value)) for k, v := range value { s, err = c.String(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = s @@ -196,7 +196,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, ) for i := 0; i < length; i++ { s, err = c.String(originValueAndKind.OriginValue.Index(i).Interface()) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } slice[i] = s @@ -208,7 +208,7 @@ func (c *impConverter) SliceStr(any interface{}, option SliceOption) ([]string, return []string{}, err } s, err = c.String(any) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []string{s}, err diff --git a/util/gconv/gconv_converter_slice_uint.go b/util/gconv/gconv_converter_slice_uint.go index 925c163a6..b66e0aca2 100644 --- a/util/gconv/gconv_converter_slice_uint.go +++ b/util/gconv/gconv_converter_slice_uint.go @@ -31,7 +31,7 @@ func (c *impConverter) SliceUint(any interface{}, option SliceOption) ([]uint, e array = make([]uint, len(value)) for k, v := range value { ui, err = c.Uint(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -80,7 +80,7 @@ func (c *impConverter) SliceUint(any interface{}, option SliceOption) ([]uint, e } if utils.IsNumeric(value) { ui, err = c.Uint(value) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []uint{ui}, err @@ -113,7 +113,7 @@ func (c *impConverter) SliceUint(any interface{}, option SliceOption) ([]uint, e array = make([]uint, len(value)) for k, v := range value { ui, err = c.Uint(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -122,7 +122,7 @@ func (c *impConverter) SliceUint(any interface{}, option SliceOption) ([]uint, e array = make([]uint, len(value)) for k, v := range value { ui, err = c.Uint(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -131,7 +131,7 @@ func (c *impConverter) SliceUint(any interface{}, option SliceOption) ([]uint, e array = make([]uint, len(value)) for k, v := range value { ui, err = c.Uint(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -140,7 +140,7 @@ func (c *impConverter) SliceUint(any interface{}, option SliceOption) ([]uint, e array = make([]uint, len(value)) for k, v := range value { ui, err = c.Uint(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -168,7 +168,7 @@ func (c *impConverter) SliceUint(any interface{}, option SliceOption) ([]uint, e ) for i := 0; i < length; i++ { ui, err = c.Uint(originValueAndKind.OriginValue.Index(i).Interface()) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } slice[i] = ui @@ -180,7 +180,7 @@ func (c *impConverter) SliceUint(any interface{}, option SliceOption) ([]uint, e return []uint{}, err } ui, err = c.Uint(any) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []uint{ui}, err @@ -202,7 +202,7 @@ func (c *impConverter) SliceUint32(any interface{}, option SliceOption) ([]uint3 array = make([]uint32, len(value)) for k, v := range value { ui, err = c.Uint32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -254,7 +254,7 @@ func (c *impConverter) SliceUint32(any interface{}, option SliceOption) ([]uint3 } if utils.IsNumeric(value) { ui, err = c.Uint32(value) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []uint32{ui}, err @@ -284,7 +284,7 @@ func (c *impConverter) SliceUint32(any interface{}, option SliceOption) ([]uint3 array = make([]uint32, len(value)) for k, v := range value { ui, err = c.Uint32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -293,7 +293,7 @@ func (c *impConverter) SliceUint32(any interface{}, option SliceOption) ([]uint3 array = make([]uint32, len(value)) for k, v := range value { ui, err = c.Uint32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -302,7 +302,7 @@ func (c *impConverter) SliceUint32(any interface{}, option SliceOption) ([]uint3 array = make([]uint32, len(value)) for k, v := range value { ui, err = c.Uint32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -311,7 +311,7 @@ func (c *impConverter) SliceUint32(any interface{}, option SliceOption) ([]uint3 array = make([]uint32, len(value)) for k, v := range value { ui, err = c.Uint32(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -338,7 +338,7 @@ func (c *impConverter) SliceUint32(any interface{}, option SliceOption) ([]uint3 ) for i := 0; i < length; i++ { ui, err = c.Uint32(originValueAndKind.OriginValue.Index(i).Interface()) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } slice[i] = ui @@ -350,7 +350,7 @@ func (c *impConverter) SliceUint32(any interface{}, option SliceOption) ([]uint3 return []uint32{}, err } ui, err = c.Uint32(any) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []uint32{ui}, err @@ -372,7 +372,7 @@ func (c *impConverter) SliceUint64(any interface{}, option SliceOption) ([]uint6 array = make([]uint64, len(value)) for k, v := range value { ui, err = c.Uint64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -424,7 +424,7 @@ func (c *impConverter) SliceUint64(any interface{}, option SliceOption) ([]uint6 } if utils.IsNumeric(value) { ui, err = c.Uint64(value) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []uint64{ui}, err @@ -454,7 +454,7 @@ func (c *impConverter) SliceUint64(any interface{}, option SliceOption) ([]uint6 array = make([]uint64, len(value)) for k, v := range value { ui, err = c.Uint64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -463,7 +463,7 @@ func (c *impConverter) SliceUint64(any interface{}, option SliceOption) ([]uint6 array = make([]uint64, len(value)) for k, v := range value { ui, err = c.Uint64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -472,7 +472,7 @@ func (c *impConverter) SliceUint64(any interface{}, option SliceOption) ([]uint6 array = make([]uint64, len(value)) for k, v := range value { ui, err = c.Uint64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -481,7 +481,7 @@ func (c *impConverter) SliceUint64(any interface{}, option SliceOption) ([]uint6 array = make([]uint64, len(value)) for k, v := range value { ui, err = c.Uint64(v) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } array[k] = ui @@ -507,7 +507,7 @@ func (c *impConverter) SliceUint64(any interface{}, option SliceOption) ([]uint6 ) for i := 0; i < length; i++ { ui, err = c.Uint64(originValueAndKind.OriginValue.Index(i).Interface()) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } slice[i] = ui @@ -519,7 +519,7 @@ func (c *impConverter) SliceUint64(any interface{}, option SliceOption) ([]uint6 return []uint64{}, err } ui, err = c.Uint64(any) - if err != nil && option.FailBreak { + if err != nil && option.BreakOnError { return nil, err } return []uint64{ui}, err diff --git a/util/gconv/gconv_map.go b/util/gconv/gconv_map.go index 246129527..9c49f9e31 100644 --- a/util/gconv/gconv_map.go +++ b/util/gconv/gconv_map.go @@ -30,10 +30,10 @@ func Map(value any, option ...MapOption) map[string]any { // Deprecated: used Map instead. func MapDeep(value any, tags ...string) map[string]any { result, _ := defaultConverter.Map(value, MapOption{ - Deep: true, - OmitEmpty: false, - Tags: tags, - FailBreak: false, + Deep: true, + OmitEmpty: false, + Tags: tags, + BreakOnError: false, }) return result }