fix lint

Signed-off-by: a1012112796 <1012112796@qq.com>

Author: a1012112796

contrib/dev/dev.go

@@ -5,15 +5,13 @@ package main
 
 import (
 	"context"
-	"fmt"
 	"io/fs"
 	"net/http"
 	"os"
 	"path"
 	"path/filepath"
 	"strings"
 
-	_ "code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/unittest"
 	"code.gitea.io/gitea/modules/graceful"
@@ -22,6 +20,9 @@ import (
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/routers"
 	"code.gitea.io/gitea/routers/common"
+
+	_ "code.gitea.io/gitea/models"
+
 	"gopkg.in/yaml.v3"
 )
 
@@ -70,21 +71,6 @@ func main() {
 	log.GetManager().Close()
 }
 
-func buildInterfacesSlice(records interface{}) ([]interface{}, error) {
-	switch records := records.(type) {
-	case []interface{}:
-		return records, nil
-	case map[string]interface{}:
-		var result []interface{}
-		for _, record := range records {
-			result = append(result, record)
-		}
-		return result, nil
-	}
-
-	return nil, fmt.Errorf("testfixtures: fixture is not a slice or map")
-}
-
 func listSubDir(dirname string, onDir func(path, name string) error) error {
 	fileInfos, err := os.ReadDir(dirname)
 	if err != nil {

models/unittest/fixtures.go

@@ -5,7 +5,6 @@
 package unittest
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -17,6 +16,7 @@ import (
 
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/modules/auth/password/hash"
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/util"
 
@@ -197,7 +197,7 @@ func defaultFixtureDumperVerbs(tableName string, actualValue reflect.Value, type
 
 		fieldValue := field.Interface()
 		isText := xormTags.HasTag("TEXT")
-		isJson := xormTags.HasTag("JSON")
+		isJSON := xormTags.HasTag("JSON")
 		conversion, hasconversion := fieldValue.(convert.Conversion)
 		if (!hasconversion) && isFieldNil(field) {
 			continue
@@ -231,7 +231,7 @@ func defaultFixtureDumperVerbs(tableName string, actualValue reflect.Value, type
 
 		int64Type := reflect.TypeOf(int64(0))
 		isInt64 := field.Type().ConvertibleTo(int64Type)
-		if fieldType.Type.Kind() == reflect.Struct && !isInt64 && !isText && !isJson {
+		if fieldType.Type.Kind() == reflect.Struct && !isInt64 && !isText && !isJSON {
 			return fmt.Errorf("%s: '%s' is a struct whcih can't be convert to a table field", tableName, xormTags.GetFieldName(fieldName))
 		}
 
@@ -240,7 +240,7 @@ func defaultFixtureDumperVerbs(tableName string, actualValue reflect.Value, type
 			return err
 		}
 
-		if isJson {
+		if isJSON {
 			result, err := json.Marshal(fieldValue)
 			if err != nil {
 				return err
@@ -363,7 +363,7 @@ func (l xormTagList) HasTag(name string) bool {
 }
 
 func (l xormTagList) GetFieldName(defaultName string) string {
-	var reservedNames = []string{
+	reservedNames := []string{
 		"TRUE",
 		"FALSE",
 		"BIT",

models/unittest/fixtures_test.go

@@ -17,12 +17,12 @@ func (t testSub2) String() string {
 	return "unknow"
 }
 
-type testSubConversion struct {
-}
+type testSubConversion struct{}
 
 func (c *testSubConversion) FromDB([]byte) error {
 	return nil
 }
+
 func (c *testSubConversion) ToDB() ([]byte, error) {
 	return []byte("testSubConversion"), nil
 }