Skip to content

Commit 3cf8f7d

Browse files
style: Use fmt.Sprint without formating (#1061)
* style: Use fmt.Sprint without formating * fix pipeline
1 parent 67f0b23 commit 3cf8f7d

File tree

7 files changed

+15
-18
lines changed

7 files changed

+15
-18
lines changed

openapi3/issue376_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ info:
139139
}
140140
apaStr := ""
141141
if apa != nil {
142-
apaStr = fmt.Sprintf("%v", *apa)
142+
apaStr = fmt.Sprint(apa)
143143
}
144144

145145
encoded, err := propSchema.MarshalJSON()

openapi3filter/req_resp_decoder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (e *ParseError) Error() string {
5353
if p := e.Path(); len(p) > 0 {
5454
var arr []string
5555
for _, v := range p {
56-
arr = append(arr, fmt.Sprintf("%v", v))
56+
arr = append(arr, fmt.Sprint(v))
5757
}
5858
msg = append(msg, fmt.Sprintf("path %v", strings.Join(arr, ".")))
5959
}

openapi3filter/req_resp_decoder_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1859,15 +1859,15 @@ func TestRegisterAndUnregisterBodyDecoder(t *testing.T) {
18591859
}
18601860
return strings.Split(string(data), ","), nil
18611861
}
1862-
contentType := "application/csv"
1862+
const contentType = "application/csv"
18631863
h := make(http.Header)
18641864
h.Set(headerCT, contentType)
18651865

18661866
originalDecoder := RegisteredBodyDecoder(contentType)
18671867
require.Nil(t, originalDecoder)
18681868

18691869
RegisterBodyDecoder(contentType, decoder)
1870-
require.Equal(t, fmt.Sprintf("%v", decoder), fmt.Sprintf("%v", RegisteredBodyDecoder(contentType)))
1870+
require.Equal(t, fmt.Sprint(decoder), fmt.Sprint(RegisteredBodyDecoder(contentType)))
18711871

18721872
body := strings.NewReader("foo,bar")
18731873
schema := openapi3.NewArraySchema().WithItems(openapi3.NewStringSchema()).NewRef()

openapi3filter/req_resp_encoder_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package openapi3filter
22

33
import (
44
"fmt"
5-
"net/http"
65
"strings"
76
"testing"
87

@@ -14,15 +13,13 @@ func TestRegisterAndUnregisterBodyEncoder(t *testing.T) {
1413
encoder = func(body any) (data []byte, err error) {
1514
return []byte(strings.Join(body.([]string), ",")), nil
1615
}
17-
contentType := "text/csv"
18-
h := make(http.Header)
19-
h.Set(headerCT, contentType)
16+
const contentType = "text/csv"
2017

2118
originalEncoder := RegisteredBodyEncoder(contentType)
2219
require.Nil(t, originalEncoder)
2320

2421
RegisterBodyEncoder(contentType, encoder)
25-
require.Equal(t, fmt.Sprintf("%v", encoder), fmt.Sprintf("%v", RegisteredBodyEncoder(contentType)))
22+
require.Equal(t, fmt.Sprint(encoder), fmt.Sprint(RegisteredBodyEncoder(contentType)))
2623

2724
body := []string{"foo", "bar"}
2825
got, err := encodeBody(body, contentType)

openapi3filter/validate_request.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ func ValidateRequest(ctx context.Context, input *RequestValidationInput) error {
108108
// appendToQueryValues adds to query parameters each value in the provided slice
109109
func appendToQueryValues[T any](q url.Values, parameterName string, v []T) {
110110
for _, i := range v {
111-
q.Add(parameterName, fmt.Sprintf("%v", i))
111+
q.Add(parameterName, fmt.Sprint(i))
112112
}
113113
}
114114

115115
func joinValues(values []any, sep string) string {
116116
strValues := make([]string, 0, len(values))
117117
for _, v := range values {
118-
strValues = append(strValues, fmt.Sprintf("%v", v))
118+
strValues = append(strValues, fmt.Sprint(v))
119119
}
120120
return strings.Join(strValues, sep)
121121
}
@@ -130,7 +130,7 @@ func populateDefaultQueryParameters(q url.Values, parameterName string, value an
130130
q.Add(parameterName, joinValues(t, ","))
131131
}
132132
default:
133-
q.Add(parameterName, fmt.Sprintf("%v", value))
133+
q.Add(parameterName, fmt.Sprint(value))
134134
}
135135
}
136136

@@ -191,11 +191,11 @@ func ValidateParameter(ctx context.Context, input *RequestValidationInput, param
191191
populateDefaultQueryParameters(q, parameter.Name, value, explode)
192192
req.URL.RawQuery = q.Encode()
193193
case openapi3.ParameterInHeader:
194-
req.Header.Add(parameter.Name, fmt.Sprintf("%v", value))
194+
req.Header.Add(parameter.Name, fmt.Sprint(value))
195195
case openapi3.ParameterInCookie:
196196
req.AddCookie(&http.Cookie{
197197
Name: parameter.Name,
198-
Value: fmt.Sprintf("%v", value),
198+
Value: fmt.Sprint(value),
199199
})
200200
}
201201
}

openapi3filter/validation_error_encoder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,13 @@ func convertSchemaError(e *RequestError, innerErr *openapi3.SchemaError) *Valida
160160
if innerErr.SchemaField == "enum" {
161161
enums := make([]string, 0, len(innerErr.Schema.Enum))
162162
for _, enum := range innerErr.Schema.Enum {
163-
enums = append(enums, fmt.Sprintf("%v", enum))
163+
enums = append(enums, fmt.Sprint(enum))
164164
}
165165
cErr.Detail = fmt.Sprintf("value %v at %s must be one of: %s",
166166
innerErr.Value,
167167
toJSONPointer(innerErr.JSONPointer()),
168168
strings.Join(enums, ", "))
169-
value := fmt.Sprintf("%v", innerErr.Value)
169+
value := fmt.Sprint(innerErr.Value)
170170
if e.Parameter != nil &&
171171
(e.Parameter.Explode == nil || *e.Parameter.Explode) &&
172172
(e.Parameter.Style == "" || e.Parameter.Style == "form") &&

openapi3filter/validation_error_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,13 +592,13 @@ func TestValidationHandler_validateRequest(t *testing.T) {
592592
req.Equal(tt.wantErrSchemaReason, innerErr.Reason)
593593
pointer := toJSONPointer(innerErr.JSONPointer())
594594
req.Equal(tt.wantErrSchemaPath, pointer)
595-
req.Equal(fmt.Sprintf("%v", tt.wantErrSchemaValue), fmt.Sprintf("%v", innerErr.Value))
595+
req.Equal(fmt.Sprint(tt.wantErrSchemaValue), fmt.Sprint(innerErr.Value))
596596

597597
if originErr, ok := innerErr.Origin.(*openapi3.SchemaError); ok {
598598
req.Equal(tt.wantErrSchemaOriginReason, originErr.Reason)
599599
pointer := toJSONPointer(originErr.JSONPointer())
600600
req.Equal(tt.wantErrSchemaOriginPath, pointer)
601-
req.Equal(fmt.Sprintf("%v", tt.wantErrSchemaOriginValue), fmt.Sprintf("%v", originErr.Value))
601+
req.Equal(fmt.Sprint(tt.wantErrSchemaOriginValue), fmt.Sprint(originErr.Value))
602602
}
603603
} else {
604604
req.False(tt.wantErrSchemaReason != "" || tt.wantErrSchemaPath != "",

0 commit comments

Comments
 (0)