mirror of
https://gitee.com/johng/gf
synced 2026-06-06 02:25:47 +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.
234 lines
6.2 KiB
Go
234 lines
6.2 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 gxml_test
|
|
|
|
import (
|
|
"bytes"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/gogf/gf/v2/encoding/gcharset"
|
|
"github.com/gogf/gf/v2/encoding/gjson"
|
|
"github.com/gogf/gf/v2/encoding/gxml"
|
|
"github.com/gogf/gf/v2/test/gtest"
|
|
)
|
|
|
|
var testData = []struct {
|
|
utf8, other, otherEncoding string
|
|
}{
|
|
{"Hello 常用國字標準字體表", "Hello \xb1`\xa5\u03b0\xea\xa6r\xbc\u0437\u01e6r\xc5\xe9\xaa\xed", "big5"},
|
|
{"Hello 常用國字標準字體表", "Hello \xb3\xa3\xd3\xc3\x87\xf8\xd7\xd6\x98\xcb\x9c\xca\xd7\xd6\xf3\x77\xb1\xed", "gbk"},
|
|
{"Hello 常用國字標準字體表", "Hello \xb3\xa3\xd3\xc3\x87\xf8\xd7\xd6\x98\xcb\x9c\xca\xd7\xd6\xf3\x77\xb1\xed", "gb18030"},
|
|
}
|
|
|
|
var testErrData = []struct {
|
|
utf8, other, otherEncoding string
|
|
}{
|
|
{"Hello 常用國字標準字體表", "Hello \xb3\xa3\xd3\xc3\x87\xf8\xd7\xd6\x98\xcb\x9c\xca\xd7\xd6\xf3\x77\xb1\xed", "gbk"},
|
|
}
|
|
|
|
func buildXml(charset string, str string) (string, string) {
|
|
head := `<?xml version="1.0" encoding="UTF-8"?>`
|
|
srcXml := strings.Replace(head, "UTF-8", charset, -1)
|
|
|
|
srcParser := gjson.New(nil)
|
|
srcParser.Set("name", str)
|
|
srcParser.Set("age", "12")
|
|
|
|
s, err := srcParser.ToXml()
|
|
if err != nil {
|
|
return "", ""
|
|
}
|
|
|
|
srcXml = srcXml + string(s)
|
|
srcXml, err = gcharset.UTF8To(charset, srcXml)
|
|
if err != nil {
|
|
return "", ""
|
|
}
|
|
|
|
dstXml := head + string(s)
|
|
|
|
return srcXml, dstXml
|
|
}
|
|
|
|
// 测试XML中字符集的转换
|
|
func Test_XmlToJson(t *testing.T) {
|
|
for _, v := range testData {
|
|
srcXml, dstXml := buildXml(v.otherEncoding, v.utf8)
|
|
if len(srcXml) == 0 && len(dstXml) == 0 {
|
|
t.Errorf("build xml string error. srcEncoding:%s, src:%s, utf8:%s", v.otherEncoding, v.other, v.utf8)
|
|
}
|
|
|
|
srcJson, err := gxml.ToJson([]byte(srcXml))
|
|
if err != nil {
|
|
t.Errorf("gxml.ToJson error. %s", srcXml)
|
|
}
|
|
|
|
dstJson, err := gxml.ToJson([]byte(dstXml))
|
|
if err != nil {
|
|
t.Errorf("dstXml to json error. %s", dstXml)
|
|
}
|
|
|
|
if !bytes.Equal(srcJson, dstJson) {
|
|
t.Errorf("convert to json error. srcJson:%s, dstJson:%s", string(srcJson), string(dstJson))
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
func Test_Decode1(t *testing.T) {
|
|
for _, v := range testData {
|
|
srcXml, dstXml := buildXml(v.otherEncoding, v.utf8)
|
|
if len(srcXml) == 0 && len(dstXml) == 0 {
|
|
t.Errorf("build xml string error. srcEncoding:%s, src:%s, utf8:%s", v.otherEncoding, v.other, v.utf8)
|
|
}
|
|
|
|
srcMap, err := gxml.Decode([]byte(srcXml))
|
|
if err != nil {
|
|
t.Errorf("gxml.Decode error. %s", srcXml)
|
|
}
|
|
|
|
dstMap, err := gxml.Decode([]byte(dstXml))
|
|
if err != nil {
|
|
t.Errorf("gxml decode error. %s", dstXml)
|
|
}
|
|
s := srcMap["doc"].(map[string]any)
|
|
d := dstMap["doc"].(map[string]any)
|
|
for kk, vv := range s {
|
|
if vv.(string) != d[kk].(string) {
|
|
t.Errorf("convert to map error. src:%v, dst:%v", vv, d[kk])
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func Test_Decode2(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
content := `
|
|
<?xml version="1.0" encoding="UTF-8"?><doc><username>johngcn</username><password1>123456</password1><password2>123456</password2></doc>
|
|
`
|
|
m, err := gxml.Decode([]byte(content))
|
|
t.AssertNil(err)
|
|
t.Assert(m["doc"].(map[string]any)["username"], "johngcn")
|
|
t.Assert(m["doc"].(map[string]any)["password1"], "123456")
|
|
t.Assert(m["doc"].(map[string]any)["password2"], "123456")
|
|
})
|
|
}
|
|
|
|
func Test_DecodeWitoutRoot(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
content := `
|
|
<?xml version="1.0" encoding="UTF-8"?><doc><username>johngcn</username><password1>123456</password1><password2>123456</password2></doc>
|
|
`
|
|
m, err := gxml.DecodeWithoutRoot([]byte(content))
|
|
t.AssertNil(err)
|
|
t.Assert(m["username"], "johngcn")
|
|
t.Assert(m["password1"], "123456")
|
|
t.Assert(m["password2"], "123456")
|
|
})
|
|
}
|
|
|
|
func Test_Encode(t *testing.T) {
|
|
m := make(map[string]any)
|
|
v := map[string]any{
|
|
"string": "hello world",
|
|
"int": 123,
|
|
"float": 100.92,
|
|
"bool": true,
|
|
}
|
|
m["root"] = any(v)
|
|
|
|
xmlStr, err := gxml.Encode(m)
|
|
if err != nil {
|
|
t.Errorf("encode error.")
|
|
}
|
|
// t.Logf("%s\n", string(xmlStr))
|
|
|
|
res := `<root><bool>true</bool><float>100.92</float><int>123</int><string>hello world</string></root>`
|
|
if string(xmlStr) != res {
|
|
t.Errorf("encode error. result: [%s], expect:[%s]", string(xmlStr), res)
|
|
}
|
|
}
|
|
|
|
func Test_EncodeIndent(t *testing.T) {
|
|
m := make(map[string]any)
|
|
v := map[string]any{
|
|
"string": "hello world",
|
|
"int": 123,
|
|
"float": 100.92,
|
|
"bool": true,
|
|
}
|
|
m["root"] = any(v)
|
|
|
|
_, err := gxml.EncodeWithIndent(m, "xml")
|
|
if err != nil {
|
|
t.Errorf("encodeWithIndent error.")
|
|
}
|
|
|
|
// t.Logf("%s\n", string(xmlStr))
|
|
|
|
}
|
|
|
|
func TestErrXml(t *testing.T) {
|
|
for _, v := range testErrData {
|
|
srcXml, dstXml := buildXml(v.otherEncoding, v.utf8)
|
|
if len(srcXml) == 0 && len(dstXml) == 0 {
|
|
t.Errorf("build xml string error. srcEncoding:%s, src:%s, utf8:%s", v.otherEncoding, v.other, v.utf8)
|
|
}
|
|
|
|
srcXml = strings.Replace(srcXml, "gbk", "XXX", -1)
|
|
_, err := gxml.ToJson([]byte(srcXml))
|
|
if err == nil {
|
|
t.Errorf("srcXml to json should be failed. %s", srcXml)
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
func TestErrCase(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
errXml := `<root><bool>true</bool><float>100.92</float><int>123</int><string>hello world</string>`
|
|
_, err := gxml.ToJson([]byte(errXml))
|
|
if err == nil {
|
|
t.Errorf("unexpected value: nil")
|
|
}
|
|
})
|
|
|
|
gtest.C(t, func(t *gtest.T) {
|
|
errXml := `<root><bool>true</bool><float>100.92</float><int>123</int><string>hello world</string>`
|
|
_, err := gxml.Decode([]byte(errXml))
|
|
if err == nil {
|
|
t.Errorf("unexpected value: nil")
|
|
}
|
|
})
|
|
}
|
|
|
|
func Test_Issue3716(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var (
|
|
xml = `<Person><Bio>I am a software developer & I love coding.</Bio><Email>john.doe@example.com</Email><Name><>&'"AAA</Name></Person>`
|
|
m = map[string]any{
|
|
"Person": map[string]any{
|
|
"Name": "<>&'\"AAA",
|
|
"Email": "john.doe@example.com",
|
|
"Bio": "I am a software developer & I love coding.",
|
|
},
|
|
}
|
|
)
|
|
gxml.XMLEscapeChars(true)
|
|
defer gxml.XMLEscapeChars(false)
|
|
|
|
xb, err := gxml.Encode(m)
|
|
t.AssertNil(err)
|
|
t.Assert(string(xb), xml)
|
|
|
|
dm, err := gxml.Decode(xb)
|
|
t.AssertNil(err)
|
|
t.Assert(dm, m)
|
|
})
|
|
}
|