From 9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sun, 25 Jul 2021 00:03:58 +0800
Subject: 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
---
 modules/setting/log.go          | 5 +----
 modules/setting/session.go      | 4 +---
 modules/setting/setting.go      | 3 +--
 modules/setting/setting_test.go | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'modules/setting')

diff --git a/modules/setting/log.go b/modules/setting/log.go
index 0fb108c93d..ecf0711484 100644
--- a/modules/setting/log.go
+++ b/modules/setting/log.go
@@ -13,14 +13,13 @@ import (
 	"strings"
 	"sync"
 
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
-	jsoniter "github.com/json-iterator/go"
 
 	ini "gopkg.in/ini.v1"
 )
 
 var filenameSuffix = ""
-
 var descriptionLock = sync.RWMutex{}
 var logDescriptions = make(map[string]*LogDescription)
 
@@ -203,8 +202,6 @@ func generateLogConfig(sec *ini.Section, name string, defaults defaultLogOptions
 	}
 
 	logConfig["colorize"] = sec.Key("COLORIZE").MustBool(false)
-
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	byteConfig, err := json.Marshal(logConfig)
 	if err != nil {
 		log.Error("Failed to marshal log configuration: %v %v", logConfig, err)
diff --git a/modules/setting/session.go b/modules/setting/session.go
index bce73b51da..9e6193e826 100644
--- a/modules/setting/session.go
+++ b/modules/setting/session.go
@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
-	jsoniter "github.com/json-iterator/go"
 )
 
 var (
@@ -65,8 +65,6 @@ func newSessionService() {
 	default:
 		SessionConfig.SameSite = http.SameSiteLaxMode
 	}
-
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	shadowConfig, err := json.Marshal(SessionConfig)
 	if err != nil {
 		log.Fatal("Can't shadow session config: %v", err)
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index e3da5796e4..593677344f 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -24,11 +24,11 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/modules/generate"
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/user"
 	"code.gitea.io/gitea/modules/util"
 
-	jsoniter "github.com/json-iterator/go"
 	shellquote "github.com/kballard/go-shellquote"
 	"github.com/unknwon/com"
 	gossh "golang.org/x/crypto/ssh"
@@ -1116,7 +1116,6 @@ func MakeManifestData(appName string, appURL string, absoluteAssetURL string) []
 		Icons     []manifestIcon `json:"icons"`
 	}
 
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	bytes, err := json.Marshal(&manifestJSON{
 		Name:      appName,
 		ShortName: appName,
diff --git a/modules/setting/setting_test.go b/modules/setting/setting_test.go
index 9bc77ab0bb..0e7f5a55ab 100644
--- a/modules/setting/setting_test.go
+++ b/modules/setting/setting_test.go
@@ -7,7 +7,8 @@ package setting
 import (
 	"testing"
 
-	jsoniter "github.com/json-iterator/go"
+	"code.gitea.io/gitea/modules/json"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -28,6 +29,5 @@ func TestMakeAbsoluteAssetURL(t *testing.T) {
 
 func TestMakeManifestData(t *testing.T) {
 	jsonBytes := MakeManifestData(`Example App '\"`, "https://example.com", "https://example.com/foo/bar")
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	assert.True(t, json.Valid(jsonBytes))
 }
-- 
cgit v1.2.3