Resolve conflict

Author: lunny

models/helper.go

@@ -7,7 +7,7 @@ package models
 import (
 	"encoding/binary"
 
-	jsoniter "github.com/json-iterator/go"
+	"code.gitea.io/gitea/modules/json"
 )
 
 func keysInt64(m map[int64]struct{}) []int64 {
@@ -37,7 +37,6 @@ func valuesUser(m map[int64]*User) []*User {
 // JSONUnmarshalHandleDoubleEncode - due to a bug in xorm (see https://gitea.com/xorm/xorm/pulls/1957) - it's
 // possible that a Blob may be double encoded or gain an unwanted prefix of 0xff 0xfe.
 func JSONUnmarshalHandleDoubleEncode(bs []byte, v interface{}) error {
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	err := json.Unmarshal(bs, v)
 	if err != nil {
 		ok := true

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
 				}

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
 			}

services/auth/source/ldap/source.go

@@ -8,10 +8,9 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/secret"
 	"code.gitea.io/gitea/modules/setting"
-
-	jsoniter "github.com/json-iterator/go"
 )
 
 // .____     ________      _____ __________
@@ -79,7 +78,6 @@ func (source *Source) ToDB() ([]byte, error) {
 		return nil, err
 	}
 	source.BindPassword = ""
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	return json.Marshal(source)
 }
 

services/auth/source/oauth2/source.go

@@ -6,8 +6,7 @@ package oauth2
 
 import (
 	"code.gitea.io/gitea/models"
-
-	jsoniter "github.com/json-iterator/go"
+	"code.gitea.io/gitea/modules/json"
 )
 
 // ________      _____          __  .__     ________
@@ -37,7 +36,6 @@ func (source *Source) FromDB(bs []byte) error {
 
 // ToDB exports an SMTPConfig to a serialized format.
 func (source *Source) ToDB() ([]byte, error) {
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	return json.Marshal(source)
 }
 

services/auth/source/pam/source.go

@@ -6,8 +6,7 @@ package pam
 
 import (
 	"code.gitea.io/gitea/models"
-
-	jsoniter "github.com/json-iterator/go"
+	"code.gitea.io/gitea/modules/json"
 )
 
 // __________  _____      _____
@@ -33,7 +32,6 @@ func (source *Source) FromDB(bs []byte) error {
 
 // ToDB exports a PAMConfig to a serialized format.
 func (source *Source) ToDB() ([]byte, error) {
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	return json.Marshal(source)
 }
 

services/auth/source/smtp/source.go

@@ -6,8 +6,7 @@ package smtp
 
 import (
 	"code.gitea.io/gitea/models"
-
-	jsoniter "github.com/json-iterator/go"
+	"code.gitea.io/gitea/modules/json"
 )
 
 //   _________   __________________________
@@ -37,7 +36,6 @@ func (source *Source) FromDB(bs []byte) error {
 
 // ToDB exports an SMTPConfig to a serialized format.
 func (source *Source) ToDB() ([]byte, error) {
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	return json.Marshal(source)
 }
 

services/auth/source/sspi/source.go

@@ -6,7 +6,7 @@ package sspi
 
 import (
 	"code.gitea.io/gitea/models"
-	jsoniter "github.com/json-iterator/go"
+	"code.gitea.io/gitea/modules/json"
 )
 
 //   _________ ___________________.___
@@ -32,7 +32,6 @@ func (cfg *Source) FromDB(bs []byte) error {
 
 // ToDB exports an SSPIConfig to a serialized format.
 func (cfg *Source) ToDB() ([]byte, error) {
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	return json.Marshal(cfg)
 }