Add an abstract json layout to make it's easier to change json library (#16528)

* Add an abstract json layout to make it's easier to change json library

* Fix import

* Fix import sequence

* Fix blank lines

* Fix blank lines

5 files changed, 10 insertions, 12 deletions

diff --git a/models/migrations/testlogger_test.go b/models/migrations/testlogger_test.go
index 8d6e61ae64..5e3d880b54 100644
--- a/models/migrations/testlogger_test.go
+++ b/models/migrations/testlogger_test.go
@@ -14,9 +14,9 @@ import (
 	"testing"
 	"time"
 
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/queue"
-	jsoniter "github.com/json-iterator/go"
 )
 
 var (
@@ -158,7 +158,6 @@ func NewTestLogger() log.LoggerProvider {
 // Init inits connection writer with json config.
 // json config only need key "level".
 func (log *TestLogger) Init(config string) error {
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	err := json.Unmarshal([]byte(config), log)
 	if err != nil {
 		return err
diff --git a/models/migrations/v130.go b/models/migrations/v130.go
index 08a8d5fca1..7ffed3fd17 100644
--- a/models/migrations/v130.go
+++ b/models/migrations/v130.go
@@ -5,8 +5,8 @@
 package migrations
 
 import (
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/setting"
-	jsoniter "github.com/json-iterator/go"
 
 	"xorm.io/xorm"
 )
@@ -70,7 +70,6 @@ func expandWebhooks(x *xorm.Engine) error {
 
 		for _, res := range results {
 			var events HookEvent
-			json := jsoniter.ConfigCompatibleWithStandardLibrary
 			if err = json.Unmarshal([]byte(res.Events), &events); err != nil {
 				return err
 			}
diff --git a/models/migrations/v180.go b/models/migrations/v180.go
index 8a7637deba..1b735c2035 100644
--- a/models/migrations/v180.go
+++ b/models/migrations/v180.go
@@ -5,9 +5,9 @@
 package migrations
 
 import (
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/util"
 
-	jsoniter "github.com/json-iterator/go"
 	"xorm.io/builder"
 	"xorm.io/xorm"
 )
@@ -105,7 +105,6 @@ func removeCredentials(payload string) (string, error) {
 	}
 
 	var opts MigrateOptions
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	err := json.Unmarshal([]byte(payload), &opts)
 	if err != nil {
 		return "", err
diff --git a/models/migrations/v189.go b/models/migrations/v189.go
index 42b996353b..f136a89b4e 100644
--- a/models/migrations/v189.go
+++ b/models/migrations/v189.go
@@ -8,13 +8,13 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	jsoniter "github.com/json-iterator/go"
+	"code.gitea.io/gitea/modules/json"
+
 	"xorm.io/xorm"
 )
 
 func unwrapLDAPSourceCfg(x *xorm.Engine) error {
 	jsonUnmarshalHandleDoubleEncode := func(bs []byte, v interface{}) error {
-		json := jsoniter.ConfigCompatibleWithStandardLibrary
 		err := json.Unmarshal(bs, v)
 		if err != nil {
 			ok := true
@@ -84,7 +84,7 @@ func unwrapLDAPSourceCfg(x *xorm.Engine) error {
 				return fmt.Errorf("failed to unmarshal %s: %w", string(source.Cfg), err)
 			}
 			if wrapped.Source != nil && len(wrapped.Source) > 0 {
-				bs, err := jsoniter.Marshal(wrapped.Source)
+				bs, err := json.Marshal(wrapped.Source)
 				if err != nil {
 					return err
 				}
diff --git a/models/migrations/v189_test.go b/models/migrations/v189_test.go
index f4fe6dec3f..fcae5dcc73 100644
--- a/models/migrations/v189_test.go
+++ b/models/migrations/v189_test.go
@@ -7,7 +7,8 @@ package migrations
 import (
 	"testing"
 
-	jsoniter "github.com/json-iterator/go"
+	"code.gitea.io/gitea/modules/json"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -65,12 +66,12 @@ func Test_unwrapLDAPSourceCfg(t *testing.T) {
 			converted := map[string]interface{}{}
 			expected := map[string]interface{}{}
 
-			if err := jsoniter.Unmarshal([]byte(source.Cfg), &converted); err != nil {
+			if err := json.Unmarshal([]byte(source.Cfg), &converted); err != nil {
 				assert.NoError(t, err)
 				return
 			}
 
-			if err := jsoniter.Unmarshal([]byte(source.Expected), &expected); err != nil {
+			if err := json.Unmarshal([]byte(source.Expected), &expected); err != nil {
 				assert.NoError(t, err)
 				return
 			}