mirror of
https://gitee.com/johng/gf
synced 2026-06-07 02:12:11 +08:00
This pull request standardizes the use of the Go 1.18+ `any` type alias
instead of `interface{}` throughout the codebase. The change improves
code readability and aligns with modern Go best practices. The update
touches many files, including core data structures, code generation
templates, logging utilities, and test data, ensuring consistency across
all usages.
**Type alias migration to `any`:**
* Replaced all instances of `interface{}` with `any` in core data
structures such as `garray` and in generated model structs (e.g.,
`TableUser`, `User1`, `User2`) to modernize type usage.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[3]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[4]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[5]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[6]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
* Updated function signatures, method parameters, and return types from
`interface{}` to `any` in various parts of the codebase, including code
generation, service logic, and logging utilities (e.g., `mlog`).
[[1]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[2]](diffhunk://#diff-2b1953fb78cf3593d8c2c7d911e95b65fd0b847c30ed0b4d167d16fe6d781235L54-R74)
[[3]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[4]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
[[5]](diffhunk://#diff-c5d51d56f487779a2b6207c7ad26c7a20bbadcc846ce094fe60ab4cabff58c51L107-R107)
[[6]](diffhunk://#diff-f96e6a9fdb416eb1804ceaba1fe0ac637bff22c43837f8bb849c2366ce72d4a1L116-R121)
[[7]](diffhunk://#diff-f94c83a1b08ae060d9346f4a6031fc4a7b9a0b894e02d9afaa09018b6598eac0L112-R112)
[[8]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L36-R36)
[[9]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L74-R74)
[[10]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L96-R96)
**Generated code and templates:**
* Adjusted generated files and code generation templates to output `any`
instead of `interface{}` for relevant struct fields and function
signatures, ensuring that new code generation aligns with the updated
convention.
[[1]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[2]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[3]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[4]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[5]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
[[6]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[7]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[8]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
**Container and utility updates:**
* Refactored the `garray` container implementation and related
constructors/methods to use `[]any` instead of `[]interface{}`, along
with corresponding function signatures.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L52-R52)
[[3]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L62-R62)
[[4]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L73-R86)
[[5]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L96-R97)
[[6]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L107-R114)
[[7]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L124-R124)
[[8]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L135-R143)
[[9]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L167-R167)
These changes collectively modernize the codebase and prepare it for
future Go developments by using the idiomatic `any` type.
348 lines
7.7 KiB
Go
348 lines
7.7 KiB
Go
// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
|
|
//
|
|
// This Source Code Form is subject to the terms of the MIT License.
|
|
// If a copy of the MIT was not distributed with this file,
|
|
// You can obtain one at https://github.com/gogf/gf.
|
|
|
|
package gconv_test
|
|
|
|
import (
|
|
"strconv"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/gogf/gf/v2/frame/g"
|
|
"github.com/gogf/gf/v2/os/gtime"
|
|
"github.com/gogf/gf/v2/test/gtest"
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
)
|
|
|
|
type structExpect struct {
|
|
PlanetName string
|
|
Planet_Place string
|
|
planetTime string
|
|
}
|
|
|
|
type structTagGconvExpect struct {
|
|
PlanetNameGconv string `gconv:"PlanetName"`
|
|
PlanetPlaceGconv string `gconv:"-"`
|
|
}
|
|
type structTagParamExpect struct {
|
|
PlanetNameParam string `param:"PlanetName"`
|
|
PlanetPlaceParam string `param:"-"`
|
|
}
|
|
type structTagCExpect struct {
|
|
PlanetNameC string `c:"PlanetName"`
|
|
PlanetPlaceC string `c:"-"`
|
|
}
|
|
type structTagPExpect struct {
|
|
PlanetNameP string `p:"PlanetName"`
|
|
PlanetPlaceP string `p:"-"`
|
|
}
|
|
type structTagJsonExpect struct {
|
|
PlanetNameJson string `json:"PlanetName"`
|
|
PlanetPlaceJson string `json:"-"`
|
|
}
|
|
|
|
var structValueTests = []map[string]string{
|
|
{
|
|
"planetname": "Earth",
|
|
"planetplace": "亚马逊雨林",
|
|
"planettime": "2021-01-01",
|
|
},
|
|
{
|
|
"planetName": "Earth",
|
|
"planetPlace": "亚马逊雨林",
|
|
"planetTime": "2021-01-01",
|
|
},
|
|
{
|
|
"planet-name": "Earth",
|
|
"planet-place": "亚马逊雨林",
|
|
"planet-time": "2021-01-01",
|
|
},
|
|
{
|
|
"planet_name": "Earth",
|
|
"planet_place": "亚马逊雨林",
|
|
"planet_time": "2021-01-01",
|
|
},
|
|
{
|
|
"planet name": "Earth",
|
|
"planet place": "亚马逊雨林",
|
|
"planet time": "2021-01-01",
|
|
},
|
|
{
|
|
"PLANETNAME": "Earth",
|
|
"PLANETPLACE": "亚马逊雨林",
|
|
"PLANETTIME": "2021-01-01",
|
|
},
|
|
{
|
|
"PLANETnAME": "Earth",
|
|
"PLANETpLACE": "亚马逊雨林",
|
|
"PLANETtIME": "2021-01-01",
|
|
},
|
|
{
|
|
"PLANET-NAME": "Earth",
|
|
"PLANET-PLACE": "亚马逊雨林",
|
|
"PLANET-TIME": "2021-01-01",
|
|
},
|
|
{
|
|
"PLANET_NAME": "Earth",
|
|
"PLANET_PLACE": "亚马逊雨林",
|
|
"PLANET_TIME": "2021-01-01",
|
|
},
|
|
{
|
|
"PLANET NAME": "Earth",
|
|
"PLANET PLACE": "亚马逊雨林",
|
|
"PLANET TIME": "2021-01-01",
|
|
},
|
|
{
|
|
"PlanetName": "Earth",
|
|
"PlanetPlace": "亚马逊雨林",
|
|
"PlanetTime": "2021-01-01",
|
|
},
|
|
{
|
|
"Planet-Name": "Earth",
|
|
"Planet-Place": "亚马逊雨林",
|
|
"Planet-Time": "2021-01-01",
|
|
},
|
|
{
|
|
"Planet_Name": "Earth",
|
|
"Planet_Place": "亚马逊雨林",
|
|
"Planet_Time": "2021-01-01",
|
|
},
|
|
{
|
|
"Planet Name": "Earth",
|
|
"Planet Place": "亚马逊雨林",
|
|
"Planet Time": "2021-01-01",
|
|
},
|
|
}
|
|
|
|
func TestStruct(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
for _, test := range structValueTests {
|
|
var (
|
|
err error
|
|
expect = new(structExpect)
|
|
)
|
|
err = gconv.Struct(test, expect)
|
|
t.AssertNil(err)
|
|
t.Assert(expect.PlanetName, "Earth")
|
|
t.Assert(expect.Planet_Place, "亚马逊雨林")
|
|
t.Assert(expect.planetTime, "")
|
|
|
|
tagTestValue, ok := test["PlanetName"]
|
|
if !ok {
|
|
continue
|
|
}
|
|
var (
|
|
expectTagGconv = new(structTagGconvExpect)
|
|
expectTagParam = new(structTagParamExpect)
|
|
expectTagC = new(structTagCExpect)
|
|
expectTagP = new(structTagPExpect)
|
|
expectTagJson = new(structTagJsonExpect)
|
|
)
|
|
err = gconv.Struct(test, expectTagGconv)
|
|
t.AssertNil(err)
|
|
t.Assert(expectTagGconv.PlanetNameGconv, tagTestValue)
|
|
t.Assert(expectTagGconv.PlanetPlaceGconv, "")
|
|
|
|
err = gconv.Struct(test, expectTagParam)
|
|
t.AssertNil(err)
|
|
t.Assert(expectTagParam.PlanetNameParam, tagTestValue)
|
|
t.Assert(expectTagParam.PlanetPlaceParam, "")
|
|
|
|
err = gconv.Struct(test, expectTagC)
|
|
t.AssertNil(err)
|
|
t.Assert(expectTagC.PlanetNameC, tagTestValue)
|
|
t.Assert(expectTagC.PlanetPlaceC, "")
|
|
|
|
err = gconv.Struct(test, expectTagP)
|
|
t.AssertNil(err)
|
|
t.Assert(expectTagP.PlanetNameP, tagTestValue)
|
|
t.Assert(expectTagP.PlanetPlaceP, "")
|
|
|
|
err = gconv.Struct(test, expectTagJson)
|
|
t.AssertNil(err)
|
|
t.Assert(expectTagJson.PlanetNameJson, tagTestValue)
|
|
t.Assert(expectTagJson.PlanetPlaceJson, "")
|
|
}
|
|
})
|
|
|
|
// Test for nil.
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var (
|
|
err error
|
|
expect = new(structExpect)
|
|
)
|
|
|
|
err = gconv.Struct(nil, nil)
|
|
t.AssertNil(err)
|
|
t.Assert(expect.PlanetName, "")
|
|
t.Assert(expect.Planet_Place, "")
|
|
t.Assert(expect.planetTime, "")
|
|
})
|
|
}
|
|
|
|
func TestStructDuplicateField(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
m := map[string]any{
|
|
"ID": 100,
|
|
}
|
|
type Nested1 struct {
|
|
ID string
|
|
}
|
|
type Nested2 struct {
|
|
ID uint
|
|
}
|
|
type Nested3 struct {
|
|
ID int
|
|
}
|
|
type Dest struct {
|
|
ID int
|
|
Nested1
|
|
Nested2
|
|
Nested3
|
|
}
|
|
var (
|
|
err error
|
|
dest = new(Dest)
|
|
)
|
|
err = gconv.Struct(m, dest)
|
|
t.AssertNil(err)
|
|
t.Assert(dest.ID, m["ID"])
|
|
t.Assert(dest.Nested1.ID, strconv.Itoa(m["ID"].(int)))
|
|
t.Assert(dest.Nested2.ID, m["ID"])
|
|
t.Assert(dest.Nested3.ID, m["ID"])
|
|
})
|
|
}
|
|
|
|
func TestStructErr(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
type Score struct {
|
|
Name string
|
|
Result int
|
|
}
|
|
type User struct {
|
|
Score Score
|
|
}
|
|
|
|
user := new(User)
|
|
scores := map[string]any{
|
|
"Score": 1,
|
|
}
|
|
err := gconv.Struct(scores, user)
|
|
t.AssertNE(err, nil)
|
|
})
|
|
|
|
gtest.C(t, func(t *gtest.T) {
|
|
type CustomString string
|
|
type CustomStruct struct {
|
|
S string
|
|
}
|
|
var (
|
|
a CustomString = "abc"
|
|
b *CustomStruct
|
|
)
|
|
err := gconv.Scan(a, &b)
|
|
t.AssertNE(err, nil)
|
|
t.Assert(b, nil)
|
|
})
|
|
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var i *int = nil
|
|
err := gconv.Struct(map[string]string{}, i)
|
|
t.AssertNE(err, nil)
|
|
})
|
|
}
|
|
|
|
// Test for Struct containing time.Time attribute.
|
|
func TestStructWithTime(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
type S struct {
|
|
T *gtime.Time
|
|
}
|
|
var (
|
|
err error
|
|
now = time.Now()
|
|
s = new(S)
|
|
)
|
|
err = gconv.Struct(g.Map{
|
|
"t": &now,
|
|
}, s)
|
|
t.AssertNil(err)
|
|
t.Assert(s.T.UTC().Time.String(), now.UTC().String())
|
|
})
|
|
}
|
|
|
|
func TestStructs(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
for _, test := range structValueTests {
|
|
var (
|
|
err error
|
|
tests = []map[string]string{test, test}
|
|
expects []*structExpect
|
|
)
|
|
err = gconv.SliceStruct(tests, &expects)
|
|
t.AssertNil(err)
|
|
t.Assert(len(expects), 2)
|
|
for _, expect := range expects {
|
|
t.Assert(expect.PlanetName, "Earth")
|
|
t.Assert(expect.Planet_Place, "亚马逊雨林")
|
|
t.Assert(expect.planetTime, "")
|
|
}
|
|
|
|
tagTestValue, ok := test["PlanetName"]
|
|
if !ok {
|
|
continue
|
|
}
|
|
var (
|
|
expectTagGconvs = []*structTagGconvExpect{}
|
|
expectTagParams = []*structTagParamExpect{}
|
|
expectTagCs = []*structTagCExpect{}
|
|
expectTagPs = []*structTagPExpect{}
|
|
expectTagJsons = []*structTagJsonExpect{}
|
|
)
|
|
|
|
err = gconv.SliceStruct(tests, &expectTagGconvs)
|
|
t.AssertNil(err)
|
|
t.Assert(len(expectTagGconvs), 2)
|
|
for _, expect := range expectTagGconvs {
|
|
t.Assert(expect.PlanetNameGconv, tagTestValue)
|
|
t.Assert(expect.PlanetPlaceGconv, "")
|
|
}
|
|
|
|
err = gconv.SliceStruct(tests, &expectTagParams)
|
|
t.AssertNil(err)
|
|
t.Assert(len(expectTagParams), 2)
|
|
for _, expect := range expectTagParams {
|
|
t.Assert(expect.PlanetNameParam, tagTestValue)
|
|
t.Assert(expect.PlanetPlaceParam, "")
|
|
}
|
|
|
|
err = gconv.SliceStruct(tests, &expectTagCs)
|
|
t.AssertNil(err)
|
|
t.Assert(len(expectTagCs), 2)
|
|
for _, expect := range expectTagCs {
|
|
t.Assert(expect.PlanetNameC, tagTestValue)
|
|
t.Assert(expect.PlanetPlaceC, "")
|
|
}
|
|
|
|
err = gconv.SliceStruct(tests, &expectTagPs)
|
|
t.AssertNil(err)
|
|
t.Assert(len(expectTagPs), 2)
|
|
for _, expect := range expectTagPs {
|
|
t.Assert(expect.PlanetNameP, tagTestValue)
|
|
t.Assert(expect.PlanetPlaceP, "")
|
|
}
|
|
|
|
err = gconv.SliceStruct(tests, &expectTagJsons)
|
|
t.AssertNil(err)
|
|
t.Assert(len(expectTagJsons), 2)
|
|
for _, expect := range expectTagJsons {
|
|
t.Assert(expect.PlanetNameJson, tagTestValue)
|
|
t.Assert(expect.PlanetPlaceJson, "")
|
|
}
|
|
}
|
|
})
|
|
}
|