diff --git a/pkg/http/http.go b/pkg/http/http.go index d3c5b4f..46f8250 100644 --- a/pkg/http/http.go +++ b/pkg/http/http.go @@ -17,11 +17,11 @@ var DefaultHTTPClient = &http.Client{ } type Decoder interface { - Decode(dst interface{}, src map[string][]string) error + Decode(dst any, src map[string][]string) error } type Encoder interface { - Encode(src interface{}, dst map[string][]string) error + Encode(src any, dst map[string][]string) error } type FormAuthorization func(url.Values) @@ -33,7 +33,7 @@ func AuthorizeBasic(user, password string) RequestAuthorization { } } -func FormRequest(endpoint string, request interface{}, encoder Encoder, authFn interface{}) (*http.Request, error) { +func FormRequest(endpoint string, request any, encoder Encoder, authFn any) (*http.Request, error) { form := url.Values{} if err := encoder.Encode(request, form); err != nil { return nil, err @@ -53,7 +53,7 @@ func FormRequest(endpoint string, request interface{}, encoder Encoder, authFn i return req, nil } -func HttpRequest(client *http.Client, req *http.Request, response interface{}) error { +func HttpRequest(client *http.Client, req *http.Request, response any) error { resp, err := client.Do(req) if err != nil { return err @@ -76,7 +76,7 @@ func HttpRequest(client *http.Client, req *http.Request, response interface{}) e return nil } -func URLEncodeParams(resp interface{}, encoder Encoder) (url.Values, error) { +func URLEncodeParams(resp any, encoder Encoder) (url.Values, error) { values := make(map[string][]string) err := encoder.Encode(resp, values) if err != nil { diff --git a/pkg/http/marshal.go b/pkg/http/marshal.go index 794a28a..71ed2c2 100644 --- a/pkg/http/marshal.go +++ b/pkg/http/marshal.go @@ -8,11 +8,11 @@ import ( "reflect" ) -func MarshalJSON(w http.ResponseWriter, i interface{}) { +func MarshalJSON(w http.ResponseWriter, i any) { MarshalJSONWithStatus(w, i, http.StatusOK) } -func MarshalJSONWithStatus(w http.ResponseWriter, i interface{}, status int) { +func MarshalJSONWithStatus(w http.ResponseWriter, i any, status int) { w.Header().Set("content-type", "application/json") w.WriteHeader(status) if i == nil || (reflect.ValueOf(i).Kind() == reflect.Ptr && reflect.ValueOf(i).IsNil()) { diff --git a/pkg/http/marshal_test.go b/pkg/http/marshal_test.go index 3838a44..dcc7fdd 100644 --- a/pkg/http/marshal_test.go +++ b/pkg/http/marshal_test.go @@ -94,7 +94,7 @@ func TestConcatenateJSON(t *testing.T) { func TestMarshalJSONWithStatus(t *testing.T) { type args struct { - i interface{} + i any status int } type res struct {