Skip to content

Commit 0be76da

Browse files
lunnylunny
committed
Fix blank lines
1 parent d32d021 commit 0be76da

File tree

7 files changed

+21
-19
lines changed

7 files changed

+21
-19
lines changed

‎integrations/lfs_getobject_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414

1515
"code.gitea.io/gitea/models"
1616
"code.gitea.io/gitea/modules/git"
17+
"code.gitea.io/gitea/modules/json"
1718
"code.gitea.io/gitea/modules/lfs"
1819
"code.gitea.io/gitea/modules/setting"
1920
"code.gitea.io/gitea/routers/web"
2021

21-
jsoniter "github.com/json-iterator/go"
2222
gzipp "github.com/klauspost/compress/gzip"
2323
"github.com/stretchr/testify/assert"
2424
)
@@ -206,7 +206,7 @@ func TestGetLFSRange(t *testing.T) {
206206
assert.Equal(t, tt.out, resp.Body.String())
207207
} else {
208208
var er lfs.ErrorResponse
209-
err := jsoniter.Unmarshal(resp.Body.Bytes(), &er)
209+
err := json.Unmarshal(resp.Body.Bytes(), &er)
210210
assert.NoError(t, err)
211211
assert.Equal(t, tt.out, er.Message)
212212
}

‎modules/lfs/http_client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ package lfs
77
import (
88
"bytes"
99
"context"
10-
"encoding/json"
1110
"errors"
1211
"fmt"
1312
"net/http"
1413
"net/url"
1514
"strings"
1615

16+
"code.gitea.io/gitea/modules/json"
1717
"code.gitea.io/gitea/modules/log"
1818
)
1919

‎modules/lfs/http_client_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ import (
1313
"strings"
1414
"testing"
1515

16-
jsoniter "github.com/json-iterator/go"
16+
"code.gitea.io/gitea/modules/json"
17+
1718
"github.com/stretchr/testify/assert"
1819
)
1920

@@ -146,7 +147,7 @@ func lfsTestRoundtripHandler(req *http.Request) *http.Response {
146147
}
147148

148149
payload := new(bytes.Buffer)
149-
jsoniter.NewEncoder(payload).Encode(batchResponse)
150+
json.NewEncoder(payload).Encode(batchResponse)
150151

151152
return &http.Response{StatusCode: http.StatusOK, Body: ioutil.NopCloser(payload)}
152153
}
@@ -160,7 +161,7 @@ func TestHTTPClientDownload(t *testing.T) {
160161
assert.Equal(t, MediaType, req.Header.Get("Accept"))
161162

162163
var batchRequest BatchRequest
163-
err := jsoniter.NewDecoder(req.Body).Decode(&batchRequest)
164+
err := json.NewDecoder(req.Body).Decode(&batchRequest)
164165
assert.NoError(t, err)
165166

166167
assert.Equal(t, "download", batchRequest.Operation)
@@ -267,7 +268,7 @@ func TestHTTPClientUpload(t *testing.T) {
267268
assert.Equal(t, MediaType, req.Header.Get("Accept"))
268269

269270
var batchRequest BatchRequest
270-
err := jsoniter.NewDecoder(req.Body).Decode(&batchRequest)
271+
err := json.NewDecoder(req.Body).Decode(&batchRequest)
271272
assert.NoError(t, err)
272273

273274
assert.Equal(t, "upload", batchRequest.Operation)

‎modules/lfs/transferadapter.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"io"
1313
"net/http"
1414

15+
"code.gitea.io/gitea/modules/json"
1516
"code.gitea.io/gitea/modules/log"
16-
jsoniter "github.com/json-iterator/go"
1717
)
1818

1919
// TransferAdapter represents an adapter for downloading/uploading LFS objects
@@ -64,7 +64,7 @@ func (a *BasicTransferAdapter) Upload(ctx context.Context, l *Link, p Pointer, r
6464

6565
// Verify calls the verify handler on the LFS server
6666
func (a *BasicTransferAdapter) Verify(ctx context.Context, l *Link, p Pointer) error {
67-
b, err := jsoniter.Marshal(p)
67+
b, err := json.Marshal(p)
6868
if err != nil {
6969
log.Error("Error encoding json: %v", err)
7070
return err
@@ -127,7 +127,7 @@ func handleErrorResponse(resp *http.Response) error {
127127

128128
func decodeReponseError(r io.Reader) (ErrorResponse, error) {
129129
var er ErrorResponse
130-
err := jsoniter.NewDecoder(r).Decode(&er)
130+
err := json.NewDecoder(r).Decode(&er)
131131
if err != nil {
132132
log.Error("Error decoding json: %v", err)
133133
}

‎modules/lfs/transferadapter_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ import (
1313
"strings"
1414
"testing"
1515

16-
jsoniter "github.com/json-iterator/go"
16+
"code.gitea.io/gitea/modules/json"
17+
1718
"github.com/stretchr/testify/assert"
1819
)
1920

@@ -49,7 +50,7 @@ func TestBasicTransferAdapter(t *testing.T) {
4950
assert.Equal(t, MediaType, req.Header.Get("Content-Type"))
5051

5152
var vp Pointer
52-
err := jsoniter.NewDecoder(req.Body).Decode(&vp)
53+
err := json.NewDecoder(req.Body).Decode(&vp)
5354
assert.NoError(t, err)
5455
assert.Equal(t, p.Oid, vp.Oid)
5556
assert.Equal(t, p.Size, vp.Size)
@@ -60,7 +61,7 @@ func TestBasicTransferAdapter(t *testing.T) {
6061
Message: "Object not found",
6162
}
6263
payload := new(bytes.Buffer)
63-
jsoniter.NewEncoder(payload).Encode(er)
64+
json.NewEncoder(payload).Encode(er)
6465

6566
return &http.Response{StatusCode: http.StatusNotFound, Body: ioutil.NopCloser(payload)}
6667
} else {

‎routers/web/user/oauth.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"code.gitea.io/gitea/models"
1616
"code.gitea.io/gitea/modules/base"
1717
"code.gitea.io/gitea/modules/context"
18+
"code.gitea.io/gitea/modules/json"
1819
"code.gitea.io/gitea/modules/log"
1920
"code.gitea.io/gitea/modules/setting"
2021
"code.gitea.io/gitea/modules/timeutil"
@@ -25,7 +26,6 @@ import (
2526

2627
"gitea.com/go-chi/binding"
2728
"github.com/golang-jwt/jwt"
28-
jsoniter "github.com/json-iterator/go"
2929
)
3030

3131
const (
@@ -507,7 +507,7 @@ func OIDCKeys(ctx *context.Context) {
507507
}
508508

509509
ctx.Resp.Header().Set("Content-Type", "application/json")
510-
enc := jsoniter.NewEncoder(ctx.Resp)
510+
enc := json.NewEncoder(ctx.Resp)
511511
if err := enc.Encode(jwks); err != nil {
512512
log.Error("Failed to encode representation as json. Error: %v", err)
513513
}

‎services/lfs/server.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ import (
1717

1818
"code.gitea.io/gitea/models"
1919
"code.gitea.io/gitea/modules/context"
20+
"code.gitea.io/gitea/modules/json"
2021
lfs_module "code.gitea.io/gitea/modules/lfs"
2122
"code.gitea.io/gitea/modules/log"
2223
"code.gitea.io/gitea/modules/setting"
2324

2425
"github.com/golang-jwt/jwt"
25-
jsoniter "github.com/json-iterator/go"
2626
)
2727

2828
// requestContext contain variables from the HTTP request.
@@ -243,7 +243,7 @@ func BatchHandler(ctx *context.Context) {
243243

244244
ctx.Resp.Header().Set("Content-Type", lfs_module.MediaType)
245245

246-
enc := jsoniter.NewEncoder(ctx.Resp)
246+
enc := json.NewEncoder(ctx.Resp)
247247
if err := enc.Encode(respobj); err != nil {
248248
log.Error("Failed to encode representation as json. Error: %v", err)
249249
}
@@ -336,7 +336,7 @@ func VerifyHandler(ctx *context.Context) {
336336
func decodeJSON(req *http.Request, v interface{}) error {
337337
defer req.Body.Close()
338338

339-
dec := jsoniter.NewDecoder(req.Body)
339+
dec := json.NewDecoder(req.Body)
340340
return dec.Decode(v)
341341
}
342342

@@ -429,7 +429,7 @@ func writeStatusMessage(ctx *context.Context, status int, message string) {
429429

430430
er := lfs_module.ErrorResponse{Message: message}
431431

432-
enc := jsoniter.NewEncoder(ctx.Resp)
432+
enc := json.NewEncoder(ctx.Resp)
433433
if err := enc.Encode(er); err != nil {
434434
log.Error("Failed to encode error response as json. Error: %v", err)
435435
}

0 commit comments

Comments
 (0)