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

1 files changed, 1 insertions, 6 deletions

diff --git a/modules/queue/helper.go b/modules/queue/helper.go
index e0368bce3a..f1aba411a8 100644
--- a/modules/queue/helper.go
+++ b/modules/queue/helper.go
@@ -7,7 +7,7 @@ package queue
 import (
 	"reflect"
 
-	jsoniter "github.com/json-iterator/go"
+	"code.gitea.io/gitea/modules/json"
 )
 
 // Mappable represents an interface that can MapTo another interface
@@ -20,8 +20,6 @@ type Mappable interface {
 // It will tolerate the cfg being passed as a []byte or string of a json representation of the
 // exemplar or the correct type of the exemplar itself
 func toConfig(exemplar, cfg interface{}) (interface{}, error) {
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
-
 	// First of all check if we've got the same type as the exemplar - if so it's all fine.
 	if reflect.TypeOf(cfg).AssignableTo(reflect.TypeOf(exemplar)) {
 		return cfg, nil
@@ -48,7 +46,6 @@ func toConfig(exemplar, cfg interface{}) (interface{}, error) {
 	if !ok {
 		// hmm ... can we marshal it to json?
 		var err error
-
 		configBytes, err = json.Marshal(cfg)
 		ok = err == nil
 	}
@@ -68,7 +65,6 @@ func toConfig(exemplar, cfg interface{}) (interface{}, error) {
 
 // unmarshalAs will attempt to unmarshal provided bytes as the provided exemplar
 func unmarshalAs(bs []byte, exemplar interface{}) (data Data, err error) {
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	if exemplar != nil {
 		t := reflect.TypeOf(exemplar)
 		n := reflect.New(t)
@@ -78,7 +74,6 @@ func unmarshalAs(bs []byte, exemplar interface{}) (data Data, err error) {
 	} else {
 		err = json.Unmarshal(bs, &data)
 	}
-
 	return
 }