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

4 files changed, 15 insertions, 15 deletions

diff --git a/modules/lfs/http_client.go b/modules/lfs/http_client.go
index e799b80831..31c67903a8 100644
--- a/modules/lfs/http_client.go
+++ b/modules/lfs/http_client.go
@@ -13,9 +13,8 @@ import (
 	"net/url"
 	"strings"
 
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
-
-	jsoniter "github.com/json-iterator/go"
 )
 
 const batchSize = 20
@@ -69,7 +68,7 @@ func (c *HTTPClient) batch(ctx context.Context, operation string, objects []Poin
 	request := &BatchRequest{operation, c.transferNames(), nil, objects}
 
 	payload := new(bytes.Buffer)
-	err := jsoniter.NewEncoder(payload).Encode(request)
+	err := json.NewEncoder(payload).Encode(request)
 	if err != nil {
 		log.Error("Error encoding json: %v", err)
 		return nil, err
@@ -102,7 +101,7 @@ func (c *HTTPClient) batch(ctx context.Context, operation string, objects []Poin
 	}
 
 	var response BatchResponse
-	err = jsoniter.NewDecoder(res.Body).Decode(&response)
+	err = json.NewDecoder(res.Body).Decode(&response)
 	if err != nil {
 		log.Error("Error decoding json: %v", err)
 		return nil, err
diff --git a/modules/lfs/http_client_test.go b/modules/lfs/http_client_test.go
index 0f633ede54..589773e45b 100644
--- a/modules/lfs/http_client_test.go
+++ b/modules/lfs/http_client_test.go
@@ -13,7 +13,8 @@ import (
 	"strings"
 	"testing"
 
-	jsoniter "github.com/json-iterator/go"
+	"code.gitea.io/gitea/modules/json"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -146,7 +147,7 @@ func lfsTestRoundtripHandler(req *http.Request) *http.Response {
 	}
 
 	payload := new(bytes.Buffer)
-	jsoniter.NewEncoder(payload).Encode(batchResponse)
+	json.NewEncoder(payload).Encode(batchResponse)
 
 	return &http.Response{StatusCode: http.StatusOK, Body: ioutil.NopCloser(payload)}
 }
@@ -160,7 +161,7 @@ func TestHTTPClientDownload(t *testing.T) {
 		assert.Equal(t, MediaType, req.Header.Get("Accept"))
 
 		var batchRequest BatchRequest
-		err := jsoniter.NewDecoder(req.Body).Decode(&batchRequest)
+		err := json.NewDecoder(req.Body).Decode(&batchRequest)
 		assert.NoError(t, err)
 
 		assert.Equal(t, "download", batchRequest.Operation)
@@ -267,7 +268,7 @@ func TestHTTPClientUpload(t *testing.T) {
 		assert.Equal(t, MediaType, req.Header.Get("Accept"))
 
 		var batchRequest BatchRequest
-		err := jsoniter.NewDecoder(req.Body).Decode(&batchRequest)
+		err := json.NewDecoder(req.Body).Decode(&batchRequest)
 		assert.NoError(t, err)
 
 		assert.Equal(t, "upload", batchRequest.Operation)
diff --git a/modules/lfs/transferadapter.go b/modules/lfs/transferadapter.go
index 8c40ab8c04..03f326f26c 100644
--- a/modules/lfs/transferadapter.go
+++ b/modules/lfs/transferadapter.go
@@ -12,9 +12,8 @@ import (
 	"io"
 	"net/http"
 
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
-
-	jsoniter "github.com/json-iterator/go"
 )
 
 // TransferAdapter represents an adapter for downloading/uploading LFS objects
@@ -65,7 +64,7 @@ func (a *BasicTransferAdapter) Upload(ctx context.Context, l *Link, p Pointer, r
 
 // Verify calls the verify handler on the LFS server
 func (a *BasicTransferAdapter) Verify(ctx context.Context, l *Link, p Pointer) error {
-	b, err := jsoniter.Marshal(p)
+	b, err := json.Marshal(p)
 	if err != nil {
 		log.Error("Error encoding json: %v", err)
 		return err
@@ -128,7 +127,7 @@ func handleErrorResponse(resp *http.Response) error {
 
 func decodeReponseError(r io.Reader) (ErrorResponse, error) {
 	var er ErrorResponse
-	err := jsoniter.NewDecoder(r).Decode(&er)
+	err := json.NewDecoder(r).Decode(&er)
 	if err != nil {
 		log.Error("Error decoding json: %v", err)
 	}
diff --git a/modules/lfs/transferadapter_test.go b/modules/lfs/transferadapter_test.go
index 7dfdad417e..9192b486ed 100644
--- a/modules/lfs/transferadapter_test.go
+++ b/modules/lfs/transferadapter_test.go
@@ -13,7 +13,8 @@ import (
 	"strings"
 	"testing"
 
-	jsoniter "github.com/json-iterator/go"
+	"code.gitea.io/gitea/modules/json"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -49,7 +50,7 @@ func TestBasicTransferAdapter(t *testing.T) {
 			assert.Equal(t, MediaType, req.Header.Get("Content-Type"))
 
 			var vp Pointer
-			err := jsoniter.NewDecoder(req.Body).Decode(&vp)
+			err := json.NewDecoder(req.Body).Decode(&vp)
 			assert.NoError(t, err)
 			assert.Equal(t, p.Oid, vp.Oid)
 			assert.Equal(t, p.Size, vp.Size)
@@ -60,7 +61,7 @@ func TestBasicTransferAdapter(t *testing.T) {
 				Message: "Object not found",
 			}
 			payload := new(bytes.Buffer)
-			jsoniter.NewEncoder(payload).Encode(er)
+			json.NewEncoder(payload).Encode(er)
 
 			return &http.Response{StatusCode: http.StatusNotFound, Body: ioutil.NopCloser(payload)}
 		} else {