Skip to content

Commit fe1c2d5

Browse files
sonamtenzin2sonamtenzin2
committed
disables
1 parent 808fe9e commit fe1c2d5

File tree

6 files changed

+24
-77
lines changed

6 files changed

+24
-77
lines changed

‎.golangci.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
linters:
2-
enable:
3-
- errcheck
42
disable:
53
- unused
6-
output_format: colored-line-number
4+
- errcheck

‎errors_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ func TestMarshalErrorsWritesTheExpectedPayload(t *testing.T) {
4747
var writer io.Writer = buffer
4848

4949
_ = MarshalErrors(writer, testRow.In)
50-
if err := json.Unmarshal(buffer.Bytes(), &output); err != nil {
51-
t.Fatalf("failed to unmarshal: %v", err)
52-
}
50+
json.Unmarshal(buffer.Bytes(), &output)
5351

5452
if !reflect.DeepEqual(output, testRow.Out) {
5553
t.Fatalf("Expected: \n%#v \nto equal: \n%#v", output, testRow.Out)

‎request.go‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -453,14 +453,8 @@ func unmarshalNode(data *Node, model reflect.Value, included *map[string]*Node)
453453

454454
buf := bytes.NewBuffer(nil)
455455

456-
if err := json.NewEncoder(buf).Encode(data.Relationships[args[1]]); err != nil {
457-
er = err
458-
break
459-
}
460-
if err := json.NewDecoder(buf).Decode(relationship); err != nil {
461-
er = err
462-
break
463-
}
456+
json.NewEncoder(buf).Encode(data.Relationships[args[1]])
457+
json.NewDecoder(buf).Decode(relationship)
464458

465459
data := relationship.Data
466460

@@ -489,10 +483,7 @@ func unmarshalNode(data *Node, model reflect.Value, included *map[string]*Node)
489483

490484
buf := bytes.NewBuffer(nil)
491485
relDataStr := data.Relationships[args[1]]
492-
if err := json.NewEncoder(buf).Encode(relDataStr); err != nil {
493-
er = err
494-
break
495-
}
486+
json.NewEncoder(buf).Encode(relDataStr)
496487

497488
isExplicitNull := false
498489
relationshipDecodeErr := json.NewDecoder(buf).Decode(relationship)

‎request_test.go‎

Lines changed: 12 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"errors"
77
"fmt"
88
"io"
9-
"log"
109
"reflect"
1110
"sort"
1211
"strconv"
@@ -406,9 +405,7 @@ func TestUnmarshalNullableRelationshipsNonNullValue(t *testing.T) {
406405
}
407406

408407
outBuf := bytes.NewBuffer(nil)
409-
if err := json.NewEncoder(outBuf).Encode(payload); err != nil {
410-
t.Fatalf("failed to encode: %v", err)
411-
}
408+
json.NewEncoder(outBuf).Encode(payload)
412409

413410
out := new(WithNullableAttrs)
414411

@@ -445,9 +442,7 @@ func TestUnmarshalNullableRelationshipsExplicitNullValue(t *testing.T) {
445442
}
446443

447444
outBuf := bytes.NewBuffer(nil)
448-
if err := json.NewEncoder(outBuf).Encode(payload); err != nil {
449-
t.Fatalf("failed to encode: %v", err)
450-
}
445+
json.NewEncoder(outBuf).Encode(payload)
451446

452447
out := new(WithNullableAttrs)
453448

@@ -472,9 +467,7 @@ func TestUnmarshalNullableRelationshipsNonExistentValue(t *testing.T) {
472467
}
473468

474469
outBuf := bytes.NewBuffer(nil)
475-
if err := json.NewEncoder(outBuf).Encode(payload); err != nil {
476-
t.Fatalf("failed to encode: %v", err)
477-
}
470+
json.NewEncoder(outBuf).Encode(payload)
478471

479472
out := new(WithNullableAttrs)
480473

@@ -497,9 +490,7 @@ func TestUnmarshalNullableRelationshipsNoRelationships(t *testing.T) {
497490
}
498491

499492
outBuf := bytes.NewBuffer(nil)
500-
if err := json.NewEncoder(outBuf).Encode(payload); err != nil {
501-
t.Fatalf("failed to encode: %v", err)
502-
}
493+
json.NewEncoder(outBuf).Encode(payload)
503494

504495
out := new(WithNullableAttrs)
505496

@@ -1630,9 +1621,7 @@ func samplePayload() io.Reader {
16301621
}
16311622

16321623
out := bytes.NewBuffer(nil)
1633-
if err := json.NewEncoder(out).Encode(payload); err != nil {
1634-
log.Printf("failed to encode: %v", err)
1635-
}
1624+
json.NewEncoder(out).Encode(payload)
16361625

16371626
return out
16381627
}
@@ -1650,9 +1639,7 @@ func samplePayloadWithID() io.Reader {
16501639
}
16511640

16521641
out := bytes.NewBuffer(nil)
1653-
if err := json.NewEncoder(out).Encode(payload); err != nil {
1654-
log.Printf("failed to encode: %v", err)
1655-
}
1642+
json.NewEncoder(out).Encode(payload)
16561643

16571644
return out
16581645
}
@@ -1667,9 +1654,7 @@ func samplePayloadWithBadTypes(m map[string]interface{}) io.Reader {
16671654
}
16681655

16691656
out := bytes.NewBuffer(nil)
1670-
if err := json.NewEncoder(out).Encode(payload); err != nil {
1671-
log.Printf("failed to encode: %v", err)
1672-
}
1657+
json.NewEncoder(out).Encode(payload)
16731658

16741659
return out
16751660
}
@@ -1684,9 +1669,7 @@ func sampleWithPointerPayload(m map[string]interface{}) io.Reader {
16841669
}
16851670

16861671
out := bytes.NewBuffer(nil)
1687-
if err := json.NewEncoder(out).Encode(payload); err != nil {
1688-
log.Printf("failed to encode: %v", err)
1689-
}
1672+
json.NewEncoder(out).Encode(payload)
16901673

16911674
return out
16921675
}
@@ -1701,9 +1684,7 @@ func samplePayloadWithNullableAttrs(m map[string]interface{}) io.Reader {
17011684
}
17021685

17031686
out := bytes.NewBuffer(nil)
1704-
if err := json.NewEncoder(out).Encode(payload); err != nil {
1705-
log.Printf("failed to encode: %v", err)
1706-
}
1687+
json.NewEncoder(out).Encode(payload)
17071688

17081689
return out
17091690
}
@@ -1780,23 +1761,17 @@ func samplePayloadWithSideloaded() io.Reader {
17801761
testModel := testModel()
17811762

17821763
out := bytes.NewBuffer(nil)
1783-
if err := MarshalPayload(out, testModel); err != nil {
1784-
log.Printf("failed to marshal payload: %v", err)
1785-
}
1764+
MarshalPayload(out, testModel)
17861765

17871766
return out
17881767
}
17891768

17901769
func sampleSerializedEmbeddedTestModel() *Blog {
17911770
out := bytes.NewBuffer(nil)
1792-
if err := MarshalOnePayloadEmbedded(out, testModel()); err != nil {
1793-
log.Printf("failed to marshal one payload embedded: %v", err)
1794-
}
1771+
MarshalOnePayloadEmbedded(out, testModel())
17951772

17961773
blog := new(Blog)
1797-
if err := UnmarshalPayload(out, blog); err != nil {
1798-
log.Printf("failed to unmarshal payload: %v", err)
1799-
}
1774+
UnmarshalPayload(out, blog)
18001775

18011776
return blog
18021777
}

‎response_test.go‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ func TestMarshalPayload(t *testing.T) {
1818

1919
// One
2020
out1 := bytes.NewBuffer(nil)
21-
if err := MarshalPayload(out1, book); err != nil {
22-
t.Fatal(err)
23-
}
21+
MarshalPayload(out1, book)
2422

2523
if err := json.Unmarshal(out1.Bytes(), &jsonData); err != nil {
2624
t.Fatal(err)
@@ -31,9 +29,7 @@ func TestMarshalPayload(t *testing.T) {
3129

3230
// Many
3331
out2 := bytes.NewBuffer(nil)
34-
if err := MarshalPayload(out2, books); err != nil {
35-
t.Fatal(err)
36-
}
32+
MarshalPayload(out2, books)
3733

3834
if err := json.Unmarshal(out2.Bytes(), &jsonData); err != nil {
3935
t.Fatal(err)
@@ -940,9 +936,7 @@ func TestMarshal_Times(t *testing.T) {
940936
}
941937
// Use the standard JSON library to traverse the genereated JSON payload.
942938
data := map[string]interface{}{}
943-
if err := json.Unmarshal(out.Bytes(), &data); err != nil {
944-
t.Fatal(err)
945-
}
939+
json.Unmarshal(out.Bytes(), &data)
946940
if tc.verification != nil {
947941
if err := tc.verification(data); err != nil {
948942
t.Fatal(err)
@@ -1023,9 +1017,7 @@ func TestNullableRelationship(t *testing.T) {
10231017

10241018
// Use the standard JSON library to traverse the genereated JSON payload.
10251019
data := map[string]interface{}{}
1026-
if err := json.Unmarshal(out.Bytes(), &data); err != nil {
1027-
t.Fatal(err)
1028-
}
1020+
json.Unmarshal(out.Bytes(), &data)
10291021
if tc.verification != nil {
10301022
if err := tc.verification(data); err != nil {
10311023
t.Fatal(err)
@@ -1122,9 +1114,7 @@ func TestNullableAttr_Time(t *testing.T) {
11221114
}
11231115
// Use the standard JSON library to traverse the genereated JSON payload.
11241116
data := map[string]interface{}{}
1125-
if err := json.Unmarshal(out.Bytes(), &data); err != nil {
1126-
t.Fatal(err)
1127-
}
1117+
json.Unmarshal(out.Bytes(), &data)
11281118
if tc.verification != nil {
11291119
if err := tc.verification(data); err != nil {
11301120
t.Fatal(err)
@@ -1194,9 +1184,7 @@ func TestNullableAttr_Bool(t *testing.T) {
11941184
}
11951185
// Use the standard JSON library to traverse the genereated JSON payload.
11961186
data := map[string]interface{}{}
1197-
if err := json.Unmarshal(out.Bytes(), &data); err != nil {
1198-
t.Fatal(err)
1199-
}
1187+
json.Unmarshal(out.Bytes(), &data)
12001188
if tc.verification != nil {
12011189
if err := tc.verification(data); err != nil {
12021190
t.Fatal(err)

‎runtime.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,10 @@ func (r *Runtime) UnmarshalPayload(reader io.Reader, model interface{}) error {
7777

7878
// UnmarshalManyPayload has docs in request.go for UnmarshalManyPayload.
7979
func (r *Runtime) UnmarshalManyPayload(reader io.Reader, kind reflect.Type) (elems []interface{}, err error) {
80-
err = r.instrumentCall(UnmarshalStart, UnmarshalStop, func() error {
80+
r.instrumentCall(UnmarshalStart, UnmarshalStop, func() error {
8181
elems, err = UnmarshalManyPayload(reader, kind)
8282
return err
8383
})
84-
if err != nil {
85-
return nil, err
86-
}
8784

8885
return
8986
}

0 commit comments

Comments
 (0)