diff --git a/README.md b/README.md index c8d3d770ef..c3b3be17a1 100644 --- a/README.md +++ b/README.md @@ -291,7 +291,7 @@ func (sh *strictHandler) FindPets(w http.ResponseWriter, r *http.Request, params request.Params = params - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.FindPets(ctx, request.(FindPetsRequestObject)) } for _, middleware := range sh.middlewares { @@ -3532,7 +3532,7 @@ Will generate: // Thing defines model for Thing. type Thing struct { Id int `json:"id"` - AdditionalProperties map[string]interface{} `json:"-"` + AdditionalProperties map[string]any `json:"-"` } // with generated boilerplate below @@ -3546,7 +3546,7 @@ type Thing struct { // Getter for additional properties for Thing. Returns the specified // element and whether it was found -func (a Thing) Get(fieldName string) (value interface{}, found bool) { +func (a Thing) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -3554,9 +3554,9 @@ func (a Thing) Get(fieldName string) (value interface{}, found bool) { } // Setter for additional properties for Thing -func (a *Thing) Set(fieldName string, value interface{}) { +func (a *Thing) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } @@ -3578,9 +3578,9 @@ func (a *Thing) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) diff --git a/examples/authenticated-api/echo/server/jwt_authenticator.go b/examples/authenticated-api/echo/server/jwt_authenticator.go index ec11a2245b..b121b6d3d5 100644 --- a/examples/authenticated-api/echo/server/jwt_authenticator.go +++ b/examples/authenticated-api/echo/server/jwt_authenticator.go @@ -96,7 +96,7 @@ func GetClaimsFromToken(t jwt.Token) ([]string, error) { return make([]string, 0), nil } - var rawList []interface{} + var rawList []any if err := t.Get(PermissionsClaim, &rawList); err != nil { return nil, fmt.Errorf("getting %q claim: %w", PermissionsClaim, err) } diff --git a/examples/authenticated-api/stdhttp/server/jwt_authenticator.go b/examples/authenticated-api/stdhttp/server/jwt_authenticator.go index 163827e24b..46a1471d2f 100644 --- a/examples/authenticated-api/stdhttp/server/jwt_authenticator.go +++ b/examples/authenticated-api/stdhttp/server/jwt_authenticator.go @@ -95,7 +95,7 @@ func GetClaimsFromToken(t jwt.Token) ([]string, error) { return make([]string, 0), nil } - var rawList []interface{} + var rawList []any if err := t.Get(PermissionsClaim, &rawList); err != nil { return nil, fmt.Errorf("getting %q claim: %w", PermissionsClaim, err) } diff --git a/examples/import-mapping/samepackage/server.gen.go b/examples/import-mapping/samepackage/server.gen.go index f0dd6d85bf..9eef90fed7 100644 --- a/examples/import-mapping/samepackage/server.gen.go +++ b/examples/import-mapping/samepackage/server.gen.go @@ -251,7 +251,7 @@ func (sh *strictHandler) GetUserById(w http.ResponseWriter, r *http.Request, id request.Id = id - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetUserById(ctx, request.(GetUserByIdRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/examples/petstore-expanded/strict/api/petstore-server.gen.go b/examples/petstore-expanded/strict/api/petstore-server.gen.go index 52ff32f095..edb2d72a6c 100644 --- a/examples/petstore-expanded/strict/api/petstore-server.gen.go +++ b/examples/petstore-expanded/strict/api/petstore-server.gen.go @@ -558,7 +558,7 @@ func (sh *strictHandler) FindPets(w http.ResponseWriter, r *http.Request, params request.Params = params - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.FindPets(ctx, request.(FindPetsRequestObject)) } for _, middleware := range sh.middlewares { @@ -589,7 +589,7 @@ func (sh *strictHandler) AddPet(w http.ResponseWriter, r *http.Request) { } request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.AddPet(ctx, request.(AddPetRequestObject)) } for _, middleware := range sh.middlewares { @@ -615,7 +615,7 @@ func (sh *strictHandler) DeletePet(w http.ResponseWriter, r *http.Request, id in request.Id = id - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.DeletePet(ctx, request.(DeletePetRequestObject)) } for _, middleware := range sh.middlewares { @@ -641,7 +641,7 @@ func (sh *strictHandler) FindPetByID(w http.ResponseWriter, r *http.Request, id request.Id = id - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.FindPetByID(ctx, request.(FindPetByIDRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/examples/streaming/stdhttp/sse/streaming.gen.go b/examples/streaming/stdhttp/sse/streaming.gen.go index 01e0792dfc..0f087c9b6d 100644 --- a/examples/streaming/stdhttp/sse/streaming.gen.go +++ b/examples/streaming/stdhttp/sse/streaming.gen.go @@ -265,7 +265,7 @@ type strictHandler struct { func (sh *strictHandler) GetStream(w http.ResponseWriter, r *http.Request) { var request GetStreamRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetStream(ctx, request.(GetStreamRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/anonymous_inner_hoisting/global/client.gen.go b/internal/test/anonymous_inner_hoisting/global/client.gen.go index 5dbaaf23ed..8397c792f0 100644 --- a/internal/test/anonymous_inner_hoisting/global/client.gen.go +++ b/internal/test/anonymous_inner_hoisting/global/client.gen.go @@ -33,7 +33,7 @@ type Roles_Item struct { // SuccessfulResponse defines model for SuccessfulResponse. type SuccessfulResponse struct { // Data If successful, response from api - Data map[string]interface{} `json:"data"` + Data map[string]any `json:"data"` // Ok Indicated whether the response is successful. Ok bool `json:"ok"` diff --git a/internal/test/client/client.gen.go b/internal/test/client/client.gen.go index f25668ed5e..cd43ae4fe6 100644 --- a/internal/test/client/client.gen.go +++ b/internal/test/client/client.gen.go @@ -28,7 +28,7 @@ type SchemaObject struct { type openIdContextKey string // PostVendorJsonApplicationVndAPIPlusJSONBody defines parameters for PostVendorJson. -type PostVendorJsonApplicationVndAPIPlusJSONBody = map[string]interface{} +type PostVendorJsonApplicationVndAPIPlusJSONBody = map[string]any // PostBothJSONRequestBody defines body for PostBoth for application/json ContentType. type PostBothJSONRequestBody = SchemaObject diff --git a/internal/test/components/components.gen.go b/internal/test/components/components.gen.go index 85680e232c..054ec750cd 100644 --- a/internal/test/components/components.gen.go +++ b/internal/test/components/components.gen.go @@ -270,21 +270,21 @@ type AdditionalPropertiesObject2 struct { // AdditionalPropertiesObject3 Allows any additional property type AdditionalPropertiesObject3 struct { - Name string `json:"name"` - AdditionalProperties map[string]interface{} `json:"-"` + Name string `json:"name"` + AdditionalProperties map[string]any `json:"-"` } // AdditionalPropertiesObject4 Has anonymous field which has additional properties type AdditionalPropertiesObject4 struct { Inner AdditionalPropertiesObject4_Inner `json:"inner"` Name string `json:"name"` - AdditionalProperties map[string]interface{} `json:"-"` + AdditionalProperties map[string]any `json:"-"` } // AdditionalPropertiesObject4_Inner defines model for AdditionalPropertiesObject4.Inner. type AdditionalPropertiesObject4_Inner struct { - Name string `json:"name"` - AdditionalProperties map[string]interface{} `json:"-"` + Name string `json:"name"` + AdditionalProperties map[string]any `json:"-"` } // AdditionalPropertiesObject5 Has additional properties with schema for dictionaries @@ -349,10 +349,10 @@ type OneOfObject10 struct { } // OneOfObject100 defines model for . -type OneOfObject100 = interface{} +type OneOfObject100 = any // OneOfObject101 defines model for . -type OneOfObject101 = interface{} +type OneOfObject101 = any // OneOfObject11 additional properties of oneOf type OneOfObject11 map[string]OneOfObject11_AdditionalProperties @@ -384,8 +384,8 @@ type OneOfObject121 = float32 // OneOfObject13 oneOf with fixed discriminator and other fields allowed type OneOfObject13 struct { - Type string `json:"type"` - AdditionalProperties map[string]interface{} `json:"-"` + Type string `json:"type"` + AdditionalProperties map[string]any `json:"-"` union json.RawMessage } @@ -562,7 +562,7 @@ type EnsureEverythingIsReferencedTextBody = string // ParamsWithAddPropsParams defines parameters for ParamsWithAddProps. type ParamsWithAddPropsParams struct { // P1 This parameter has additional properties - P1 map[string]interface{} `json:"p1"` + P1 map[string]any `json:"p1"` // P2 This parameter has an anonymous inner property which needs to be // turned into a proper type for additionalProperties to work @@ -573,9 +573,9 @@ type ParamsWithAddPropsParams struct { // BodyWithAddPropsJSONBody defines parameters for BodyWithAddProps. type BodyWithAddPropsJSONBody struct { - Inner map[string]int `json:"inner"` - Name string `json:"name"` - AdditionalProperties map[string]interface{} `json:"-"` + Inner map[string]int `json:"inner"` + Name string `json:"name"` + AdditionalProperties map[string]any `json:"-"` } // EnsureEverythingIsReferencedJSONRequestBody defines body for EnsureEverythingIsReferenced for application/json ContentType. @@ -683,7 +683,7 @@ func (a AdditionalPropertiesObject1) MarshalJSON() ([]byte, error) { // Getter for additional properties for AdditionalPropertiesObject3. Returns the specified // element and whether it was found -func (a AdditionalPropertiesObject3) Get(fieldName string) (value interface{}, found bool) { +func (a AdditionalPropertiesObject3) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -691,9 +691,9 @@ func (a AdditionalPropertiesObject3) Get(fieldName string) (value interface{}, f } // Setter for additional properties for AdditionalPropertiesObject3 -func (a *AdditionalPropertiesObject3) Set(fieldName string, value interface{}) { +func (a *AdditionalPropertiesObject3) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } @@ -715,9 +715,9 @@ func (a *AdditionalPropertiesObject3) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) @@ -749,7 +749,7 @@ func (a AdditionalPropertiesObject3) MarshalJSON() ([]byte, error) { // Getter for additional properties for AdditionalPropertiesObject4. Returns the specified // element and whether it was found -func (a AdditionalPropertiesObject4) Get(fieldName string) (value interface{}, found bool) { +func (a AdditionalPropertiesObject4) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -757,9 +757,9 @@ func (a AdditionalPropertiesObject4) Get(fieldName string) (value interface{}, f } // Setter for additional properties for AdditionalPropertiesObject4 -func (a *AdditionalPropertiesObject4) Set(fieldName string, value interface{}) { +func (a *AdditionalPropertiesObject4) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } @@ -789,9 +789,9 @@ func (a *AdditionalPropertiesObject4) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) @@ -828,7 +828,7 @@ func (a AdditionalPropertiesObject4) MarshalJSON() ([]byte, error) { // Getter for additional properties for AdditionalPropertiesObject4_Inner. Returns the specified // element and whether it was found -func (a AdditionalPropertiesObject4_Inner) Get(fieldName string) (value interface{}, found bool) { +func (a AdditionalPropertiesObject4_Inner) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -836,9 +836,9 @@ func (a AdditionalPropertiesObject4_Inner) Get(fieldName string) (value interfac } // Setter for additional properties for AdditionalPropertiesObject4_Inner -func (a *AdditionalPropertiesObject4_Inner) Set(fieldName string, value interface{}) { +func (a *AdditionalPropertiesObject4_Inner) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } @@ -860,9 +860,9 @@ func (a *AdditionalPropertiesObject4_Inner) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) @@ -894,7 +894,7 @@ func (a AdditionalPropertiesObject4_Inner) MarshalJSON() ([]byte, error) { // Getter for additional properties for OneOfObject13. Returns the specified // element and whether it was found -func (a OneOfObject13) Get(fieldName string) (value interface{}, found bool) { +func (a OneOfObject13) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -902,16 +902,16 @@ func (a OneOfObject13) Get(fieldName string) (value interface{}, found bool) { } // Setter for additional properties for OneOfObject13 -func (a *OneOfObject13) Set(fieldName string, value interface{}) { +func (a *OneOfObject13) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } // Getter for additional properties for BodyWithAddPropsJSONBody. Returns the specified // element and whether it was found -func (a BodyWithAddPropsJSONBody) Get(fieldName string) (value interface{}, found bool) { +func (a BodyWithAddPropsJSONBody) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -919,9 +919,9 @@ func (a BodyWithAddPropsJSONBody) Get(fieldName string) (value interface{}, foun } // Setter for additional properties for BodyWithAddPropsJSONBody -func (a *BodyWithAddPropsJSONBody) Set(fieldName string, value interface{}) { +func (a *BodyWithAddPropsJSONBody) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } @@ -951,9 +951,9 @@ func (a *BodyWithAddPropsJSONBody) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) @@ -1534,7 +1534,7 @@ func (t OneOfObject13) Discriminator() (string, error) { return discriminator.Discriminator, err } -func (t OneOfObject13) ValueByDiscriminator() (interface{}, error) { +func (t OneOfObject13) ValueByDiscriminator() (any, error) { discriminator, err := t.Discriminator() if err != nil { return nil, err @@ -1911,7 +1911,7 @@ func (t OneOfObject5) Discriminator() (string, error) { return discriminator.Discriminator, err } -func (t OneOfObject5) ValueByDiscriminator() (interface{}, error) { +func (t OneOfObject5) ValueByDiscriminator() (any, error) { discriminator, err := t.Discriminator() if err != nil { return nil, err @@ -2000,7 +2000,7 @@ func (t OneOfObject6) Discriminator() (string, error) { return discriminator.Discriminator, err } -func (t OneOfObject6) ValueByDiscriminator() (interface{}, error) { +func (t OneOfObject6) ValueByDiscriminator() (any, error) { discriminator, err := t.Discriminator() if err != nil { return nil, err @@ -2089,7 +2089,7 @@ func (t OneOfObject61) Discriminator() (string, error) { return discriminator.Discriminator, err } -func (t OneOfObject61) ValueByDiscriminator() (interface{}, error) { +func (t OneOfObject61) ValueByDiscriminator() (any, error) { discriminator, err := t.Discriminator() if err != nil { return nil, err @@ -2178,7 +2178,7 @@ func (t OneOfObject62) Discriminator() (string, error) { return discriminator.Discriminator, err } -func (t OneOfObject62) ValueByDiscriminator() (interface{}, error) { +func (t OneOfObject62) ValueByDiscriminator() (any, error) { discriminator, err := t.Discriminator() if err != nil { return nil, err @@ -2429,7 +2429,7 @@ func (t OneOfObject9) Discriminator() (string, error) { return discriminator.Discriminator, err } -func (t OneOfObject9) ValueByDiscriminator() (interface{}, error) { +func (t OneOfObject9) ValueByDiscriminator() (any, error) { discriminator, err := t.Discriminator() if err != nil { return nil, err @@ -2508,9 +2508,9 @@ func (a *OneOfObject13) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) diff --git a/internal/test/components/components_test.go b/internal/test/components/components_test.go index 268612a3d6..e5179ff321 100644 --- a/internal/test/components/components_test.go +++ b/internal/test/components/components_test.go @@ -324,7 +324,7 @@ func TestAnyOf(t *testing.T) { func TestOneOfWithAdditional(t *testing.T) { x := OneOfObject13{ - AdditionalProperties: map[string]interface{}{"x": "y"}, + AdditionalProperties: map[string]any{"x": "y"}, } err := x.MergeOneOfVariant1(OneOfVariant1{Name: "test-name"}) require.NoError(t, err) diff --git a/internal/test/deprecation/gen.go b/internal/test/deprecation/gen.go index a37c7eb953..973942b731 100644 --- a/internal/test/deprecation/gen.go +++ b/internal/test/deprecation/gen.go @@ -1977,7 +1977,7 @@ func (sh *strictHandler) PostClients(w http.ResponseWriter, r *http.Request) { } request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.PostClients(ctx, request.(PostClientsRequestObject)) } for _, middleware := range sh.middlewares { @@ -2001,7 +2001,7 @@ func (sh *strictHandler) PostClients(w http.ResponseWriter, r *http.Request) { func (sh *strictHandler) GetDeprecatedEndpoint(w http.ResponseWriter, r *http.Request) { var request GetDeprecatedEndpointRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetDeprecatedEndpoint(ctx, request.(GetDeprecatedEndpointRequestObject)) } for _, middleware := range sh.middlewares { @@ -2032,7 +2032,7 @@ func (sh *strictHandler) PostDeprecatedEndpointWithNonDeprecatedBody(w http.Resp } request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.PostDeprecatedEndpointWithNonDeprecatedBody(ctx, request.(PostDeprecatedEndpointWithNonDeprecatedBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -2058,7 +2058,7 @@ func (sh *strictHandler) GetDeprecatedField(w http.ResponseWriter, r *http.Reque request.Params = params - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetDeprecatedField(ctx, request.(GetDeprecatedFieldRequestObject)) } for _, middleware := range sh.middlewares { @@ -2085,7 +2085,7 @@ func (sh *strictHandler) GetDeprecatedParamsOldId(w http.ResponseWriter, r *http request.OldId = oldId request.Params = params - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetDeprecatedParamsOldId(ctx, request.(GetDeprecatedParamsOldIdRequestObject)) } for _, middleware := range sh.middlewares { @@ -2116,7 +2116,7 @@ func (sh *strictHandler) PostDeprecatedRequestBody(w http.ResponseWriter, r *htt } request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.PostDeprecatedRequestBody(ctx, request.(PostDeprecatedRequestBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -2140,7 +2140,7 @@ func (sh *strictHandler) PostDeprecatedRequestBody(w http.ResponseWriter, r *htt func (sh *strictHandler) GetLegacy(w http.ResponseWriter, r *http.Request) { var request GetLegacyRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetLegacy(ctx, request.(GetLegacyRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/externalref/externalref.gen.go b/internal/test/externalref/externalref.gen.go index 808391ca48..8e4e5a9369 100644 --- a/internal/test/externalref/externalref.gen.go +++ b/internal/test/externalref/externalref.gen.go @@ -20,10 +20,10 @@ import ( // Container defines model for Container. type Container struct { - ObjectA *externalRef0.ObjectA `json:"object_a,omitempty"` - ObjectB *package_b.ObjectB `json:"object_b,omitempty"` - ObjectC *map[string]interface{} `json:"object_c,omitempty"` - Pet *externalRef1.Pet `json:"pet,omitempty"` + ObjectA *externalRef0.ObjectA `json:"object_a,omitempty"` + ObjectB *package_b.ObjectB `json:"object_b,omitempty"` + ObjectC *map[string]any `json:"object_c,omitempty"` + Pet *externalRef1.Pet `json:"pet,omitempty"` } // Base64 encoded, compressed with deflate, json marshaled OpenAPI spec. diff --git a/internal/test/issues/issue-1093/api/child/child.gen.go b/internal/test/issues/issue-1093/api/child/child.gen.go index 1275e1b202..56f8e5a08a 100644 --- a/internal/test/issues/issue-1093/api/child/child.gen.go +++ b/internal/test/issues/issue-1093/api/child/child.gen.go @@ -168,7 +168,7 @@ type strictHandler struct { func (sh *strictHandler) GetPets(ctx *gin.Context) { var request GetPetsRequestObject - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.GetPets(ctx, request.(GetPetsRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-1093/api/parent/parent.gen.go b/internal/test/issues/issue-1093/api/parent/parent.gen.go index d1696c0068..317c19cae2 100644 --- a/internal/test/issues/issue-1093/api/parent/parent.gen.go +++ b/internal/test/issues/issue-1093/api/parent/parent.gen.go @@ -173,7 +173,7 @@ type strictHandler struct { func (sh *strictHandler) GetPets(ctx *gin.Context) { var request GetPetsRequestObject - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.GetPets(ctx, request.(GetPetsRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-1168/api.gen.go b/internal/test/issues/issue-1168/api.gen.go index 06bd31b245..135202a008 100644 --- a/internal/test/issues/issue-1168/api.gen.go +++ b/internal/test/issues/issue-1168/api.gen.go @@ -29,8 +29,8 @@ type ProblemDetails struct { // Type An absolute URI that identifies the problem type. When dereferenced, it SHOULD provide human-readable documentation for the problem type (e.g., using HTML). // // Example: https://zalando.github.io/problem/constraint-violation - Type *string `json:"type,omitempty"` - AdditionalProperties map[string]interface{} `json:"-"` + Type *string `json:"type,omitempty"` + AdditionalProperties map[string]any `json:"-"` } // Misc400Error defines model for Misc400Error. @@ -41,7 +41,7 @@ type Misc404Error = ProblemDetails // Getter for additional properties for ProblemDetails. Returns the specified // element and whether it was found -func (a ProblemDetails) Get(fieldName string) (value interface{}, found bool) { +func (a ProblemDetails) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -49,9 +49,9 @@ func (a ProblemDetails) Get(fieldName string) (value interface{}, found bool) { } // Setter for additional properties for ProblemDetails -func (a *ProblemDetails) Set(fieldName string, value interface{}) { +func (a *ProblemDetails) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } @@ -105,9 +105,9 @@ func (a *ProblemDetails) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) diff --git a/internal/test/issues/issue-1182/pkg1/pkg1.gen.go b/internal/test/issues/issue-1182/pkg1/pkg1.gen.go index bf1455bc7a..c88b3a4cd2 100644 --- a/internal/test/issues/issue-1182/pkg1/pkg1.gen.go +++ b/internal/test/issues/issue-1182/pkg1/pkg1.gen.go @@ -366,7 +366,7 @@ type strictHandler struct { func (sh *strictHandler) TestGet(ctx echo.Context) error { var request TestGetRequestObject - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.TestGet(ctx.Request().Context(), request.(TestGetRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go b/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go index 4716afb5ea..38102dedd0 100644 --- a/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go +++ b/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go @@ -521,7 +521,7 @@ type strictHandler struct { func (sh *strictHandler) Test(ctx *gin.Context) { var request TestRequestObject - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.Test(ctx, request.(TestRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-1212/pkg1/pkg1.gen.go b/internal/test/issues/issue-1212/pkg1/pkg1.gen.go index 371c0a5529..33639d1df3 100644 --- a/internal/test/issues/issue-1212/pkg1/pkg1.gen.go +++ b/internal/test/issues/issue-1212/pkg1/pkg1.gen.go @@ -397,7 +397,7 @@ type strictHandler struct { func (sh *strictHandler) Test(ctx *gin.Context) { var request TestRequestObject - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.Test(ctx, request.(TestRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-1219/issue.gen.go b/internal/test/issues/issue-1219/issue.gen.go index 2beeedc59c..7f99127672 100644 --- a/internal/test/issues/issue-1219/issue.gen.go +++ b/internal/test/issues/issue-1219/issue.gen.go @@ -30,11 +30,11 @@ type MergeDefaultDefault struct { // MergeDefaultWithAny defines model for MergeDefaultWithAny. type MergeDefaultWithAny struct { - Field1 *int `json:"field1,omitempty"` - Field2 *string `json:"field2,omitempty"` - FieldA *int `json:"fieldA,omitempty"` - FieldB *string `json:"fieldB,omitempty"` - AdditionalProperties map[string]interface{} `json:"-"` + Field1 *int `json:"field1,omitempty"` + Field2 *string `json:"field2,omitempty"` + FieldA *int `json:"fieldA,omitempty"` + FieldB *string `json:"fieldB,omitempty"` + AdditionalProperties map[string]any `json:"-"` } // MergeDefaultWithString defines model for MergeDefaultWithString. @@ -56,20 +56,20 @@ type MergeDefaultWithout struct { // MergeWithAnyDefault defines model for MergeWithAnyDefault. type MergeWithAnyDefault struct { - Field1 *int `json:"field1,omitempty"` - Field2 *string `json:"field2,omitempty"` - FieldA *int `json:"fieldA,omitempty"` - FieldB *string `json:"fieldB,omitempty"` - AdditionalProperties map[string]interface{} `json:"-"` + Field1 *int `json:"field1,omitempty"` + Field2 *string `json:"field2,omitempty"` + FieldA *int `json:"fieldA,omitempty"` + FieldB *string `json:"fieldB,omitempty"` + AdditionalProperties map[string]any `json:"-"` } // MergeWithAnyWithAny defines model for MergeWithAnyWithAny. type MergeWithAnyWithAny struct { - Field1 *int `json:"field1,omitempty"` - Field2 *string `json:"field2,omitempty"` - FieldA *int `json:"fieldA,omitempty"` - FieldB *string `json:"fieldB,omitempty"` - AdditionalProperties map[string]interface{} `json:"-"` + Field1 *int `json:"field1,omitempty"` + Field2 *string `json:"field2,omitempty"` + FieldA *int `json:"fieldA,omitempty"` + FieldB *string `json:"fieldB,omitempty"` + AdditionalProperties map[string]any `json:"-"` } // MergeWithAnyWithString defines model for MergeWithAnyWithString. @@ -149,16 +149,16 @@ type MergeWithoutWithout struct { // WithAnyAdditional1 defines model for WithAnyAdditional1. type WithAnyAdditional1 struct { - Field1 *int `json:"field1,omitempty"` - Field2 *string `json:"field2,omitempty"` - AdditionalProperties map[string]interface{} `json:"-"` + Field1 *int `json:"field1,omitempty"` + Field2 *string `json:"field2,omitempty"` + AdditionalProperties map[string]any `json:"-"` } // WithAnyAdditional2 defines model for WithAnyAdditional2. type WithAnyAdditional2 struct { - FieldA *int `json:"fieldA,omitempty"` - FieldB *string `json:"fieldB,omitempty"` - AdditionalProperties map[string]interface{} `json:"-"` + FieldA *int `json:"fieldA,omitempty"` + FieldB *string `json:"fieldB,omitempty"` + AdditionalProperties map[string]any `json:"-"` } // WithStringAdditional1 defines model for WithStringAdditional1. @@ -189,7 +189,7 @@ type WithoutAdditional2 struct { // Getter for additional properties for MergeDefaultWithAny. Returns the specified // element and whether it was found -func (a MergeDefaultWithAny) Get(fieldName string) (value interface{}, found bool) { +func (a MergeDefaultWithAny) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -197,9 +197,9 @@ func (a MergeDefaultWithAny) Get(fieldName string) (value interface{}, found boo } // Setter for additional properties for MergeDefaultWithAny -func (a *MergeDefaultWithAny) Set(fieldName string, value interface{}) { +func (a *MergeDefaultWithAny) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } @@ -245,9 +245,9 @@ func (a *MergeDefaultWithAny) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) @@ -415,7 +415,7 @@ func (a MergeDefaultWithString) MarshalJSON() ([]byte, error) { // Getter for additional properties for MergeWithAnyDefault. Returns the specified // element and whether it was found -func (a MergeWithAnyDefault) Get(fieldName string) (value interface{}, found bool) { +func (a MergeWithAnyDefault) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -423,9 +423,9 @@ func (a MergeWithAnyDefault) Get(fieldName string) (value interface{}, found boo } // Setter for additional properties for MergeWithAnyDefault -func (a *MergeWithAnyDefault) Set(fieldName string, value interface{}) { +func (a *MergeWithAnyDefault) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } @@ -471,9 +471,9 @@ func (a *MergeWithAnyDefault) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) @@ -528,7 +528,7 @@ func (a MergeWithAnyDefault) MarshalJSON() ([]byte, error) { // Getter for additional properties for MergeWithAnyWithAny. Returns the specified // element and whether it was found -func (a MergeWithAnyWithAny) Get(fieldName string) (value interface{}, found bool) { +func (a MergeWithAnyWithAny) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -536,9 +536,9 @@ func (a MergeWithAnyWithAny) Get(fieldName string) (value interface{}, found boo } // Setter for additional properties for MergeWithAnyWithAny -func (a *MergeWithAnyWithAny) Set(fieldName string, value interface{}) { +func (a *MergeWithAnyWithAny) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } @@ -584,9 +584,9 @@ func (a *MergeWithAnyWithAny) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) @@ -980,7 +980,7 @@ func (a MergeWithStringWithAny) MarshalJSON() ([]byte, error) { // Getter for additional properties for WithAnyAdditional1. Returns the specified // element and whether it was found -func (a WithAnyAdditional1) Get(fieldName string) (value interface{}, found bool) { +func (a WithAnyAdditional1) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -988,9 +988,9 @@ func (a WithAnyAdditional1) Get(fieldName string) (value interface{}, found bool } // Setter for additional properties for WithAnyAdditional1 -func (a *WithAnyAdditional1) Set(fieldName string, value interface{}) { +func (a *WithAnyAdditional1) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } @@ -1020,9 +1020,9 @@ func (a *WithAnyAdditional1) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) @@ -1063,7 +1063,7 @@ func (a WithAnyAdditional1) MarshalJSON() ([]byte, error) { // Getter for additional properties for WithAnyAdditional2. Returns the specified // element and whether it was found -func (a WithAnyAdditional2) Get(fieldName string) (value interface{}, found bool) { +func (a WithAnyAdditional2) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -1071,9 +1071,9 @@ func (a WithAnyAdditional2) Get(fieldName string) (value interface{}, found bool } // Setter for additional properties for WithAnyAdditional2 -func (a *WithAnyAdditional2) Set(fieldName string, value interface{}) { +func (a *WithAnyAdditional2) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } @@ -1103,9 +1103,9 @@ func (a *WithAnyAdditional2) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) diff --git a/internal/test/issues/issue-1277/content-array.gen.go b/internal/test/issues/issue-1277/content-array.gen.go index bc866df013..b269d165cf 100644 --- a/internal/test/issues/issue-1277/content-array.gen.go +++ b/internal/test/issues/issue-1277/content-array.gen.go @@ -18,14 +18,14 @@ import ( // Test200JSONResponseBody_Item defines parameters for Test. type Test200JSONResponseBody_Item struct { - Field1 *string `json:"field1,omitempty"` - Field2 *string `json:"field2,omitempty"` - AdditionalProperties map[string]interface{} `json:"-"` + Field1 *string `json:"field1,omitempty"` + Field2 *string `json:"field2,omitempty"` + AdditionalProperties map[string]any `json:"-"` } // Getter for additional properties for Test200JSONResponseBody_Item. Returns the specified // element and whether it was found -func (a Test200JSONResponseBody_Item) Get(fieldName string) (value interface{}, found bool) { +func (a Test200JSONResponseBody_Item) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -33,9 +33,9 @@ func (a Test200JSONResponseBody_Item) Get(fieldName string) (value interface{}, } // Setter for additional properties for Test200JSONResponseBody_Item -func (a *Test200JSONResponseBody_Item) Set(fieldName string, value interface{}) { +func (a *Test200JSONResponseBody_Item) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } @@ -65,9 +65,9 @@ func (a *Test200JSONResponseBody_Item) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) @@ -572,7 +572,7 @@ type strictHandler struct { func (sh *strictHandler) Test(w http.ResponseWriter, r *http.Request) { var request TestRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.Test(ctx, request.(TestRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-1298/issue1298.gen.go b/internal/test/issues/issue-1298/issue1298.gen.go index e04903fc37..edf9632a36 100644 --- a/internal/test/issues/issue-1298/issue1298.gen.go +++ b/internal/test/issues/issue-1298/issue1298.gen.go @@ -457,7 +457,7 @@ func (sh *strictHandler) Test(ctx *gin.Context) { request.Body = &body } - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.Test(ctx, request.(TestRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-1378/bionicle/bionicle.gen.go b/internal/test/issues/issue-1378/bionicle/bionicle.gen.go index f1f561ce10..0a84bb9d0b 100644 --- a/internal/test/issues/issue-1378/bionicle/bionicle.gen.go +++ b/internal/test/issues/issue-1378/bionicle/bionicle.gen.go @@ -308,7 +308,7 @@ func (sh *strictHandler) GetBionicleName(w http.ResponseWriter, r *http.Request, request.Name = name - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetBionicleName(ctx, request.(GetBionicleNameRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-1378/fooservice/fooservice.gen.go b/internal/test/issues/issue-1378/fooservice/fooservice.gen.go index 8b38f2010a..55af9c52ee 100644 --- a/internal/test/issues/issue-1378/fooservice/fooservice.gen.go +++ b/internal/test/issues/issue-1378/fooservice/fooservice.gen.go @@ -268,7 +268,7 @@ func (sh *strictHandler) GetBionicleName(w http.ResponseWriter, r *http.Request, request.Name = name - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetBionicleName(ctx, request.(GetBionicleNameRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-1529/strict-echo/issue1529.gen.go b/internal/test/issues/issue-1529/strict-echo/issue1529.gen.go index 244ab6822b..61be9a0103 100644 --- a/internal/test/issues/issue-1529/strict-echo/issue1529.gen.go +++ b/internal/test/issues/issue-1529/strict-echo/issue1529.gen.go @@ -21,7 +21,7 @@ import ( ) // Test defines model for Test. -type Test = map[string]interface{} +type Test = map[string]any // RequestEditorFn is the function signature for the RequestEditor callback function type RequestEditorFn func(ctx context.Context, req *http.Request) error @@ -441,7 +441,7 @@ type strictHandler struct { func (sh *strictHandler) Test(ctx echo.Context) error { var request TestRequestObject - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.Test(ctx.Request().Context(), request.(TestRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-1529/strict-fiber/issue1529.gen.go b/internal/test/issues/issue-1529/strict-fiber/issue1529.gen.go index 5959bf310c..60ba38e103 100644 --- a/internal/test/issues/issue-1529/strict-fiber/issue1529.gen.go +++ b/internal/test/issues/issue-1529/strict-fiber/issue1529.gen.go @@ -21,7 +21,7 @@ import ( ) // Test defines model for Test. -type Test = map[string]interface{} +type Test = map[string]any // RequestEditorFn is the function signature for the RequestEditor callback function type RequestEditorFn func(ctx context.Context, req *http.Request) error @@ -415,7 +415,7 @@ type strictHandler struct { func (sh *strictHandler) Test(ctx *fiber.Ctx) error { var request TestRequestObject - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.Test(ctx.UserContext(), request.(TestRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-1529/strict-iris/issue1529.gen.go b/internal/test/issues/issue-1529/strict-iris/issue1529.gen.go index b77aa2d32b..bc83d92db6 100644 --- a/internal/test/issues/issue-1529/strict-iris/issue1529.gen.go +++ b/internal/test/issues/issue-1529/strict-iris/issue1529.gen.go @@ -21,7 +21,7 @@ import ( ) // Test defines model for Test. -type Test = map[string]interface{} +type Test = map[string]any // RequestEditorFn is the function signature for the RequestEditor callback function type RequestEditorFn func(ctx context.Context, req *http.Request) error @@ -398,7 +398,7 @@ type strictHandler struct { func (sh *strictHandler) Test(ctx iris.Context) { var request TestRequestObject - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.Test(ctx, request.(TestRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-1530/issue1530.gen.go b/internal/test/issues/issue-1530/issue1530.gen.go index 8a60251b2c..7378e25ea5 100644 --- a/internal/test/issues/issue-1530/issue1530.gen.go +++ b/internal/test/issues/issue-1530/issue1530.gen.go @@ -96,7 +96,7 @@ func (t ConfigSaveReq) Discriminator() (string, error) { return discriminator.Discriminator, err } -func (t ConfigSaveReq) ValueByDiscriminator() (interface{}, error) { +func (t ConfigSaveReq) ValueByDiscriminator() (any, error) { discriminator, err := t.Discriminator() if err != nil { return nil, err diff --git a/internal/test/issues/issue-1676/ping.gen.go b/internal/test/issues/issue-1676/ping.gen.go index 30229f8183..95927e70af 100644 --- a/internal/test/issues/issue-1676/ping.gen.go +++ b/internal/test/issues/issue-1676/ping.gen.go @@ -227,7 +227,7 @@ type strictHandler struct { func (sh *strictHandler) GetPing(w http.ResponseWriter, r *http.Request) { var request GetPingRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetPing(ctx, request.(GetPingRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-1914/client.gen.go b/internal/test/issues/issue-1914/client.gen.go index 15fa6fef09..1978a0e09b 100644 --- a/internal/test/issues/issue-1914/client.gen.go +++ b/internal/test/issues/issue-1914/client.gen.go @@ -192,7 +192,7 @@ func (c *Client) PostPet1234WithTextBody(ctx context.Context, body PostPet1234Te // NewPostPetRequestWithTextBody calls the generic PostPet builder with text/plain body func NewPostPetRequestWithTextBody(server string, body PostPetTextRequestBody) (*http.Request, error) { var bodyReader io.Reader - if stringer, ok := interface{}(body).(fmt.Stringer); ok { + if stringer, ok := any(body).(fmt.Stringer); ok { bodyReader = strings.NewReader(stringer.String()) } else { bodyReader = strings.NewReader(fmt.Sprint(body)) @@ -232,7 +232,7 @@ func NewPostPetRequestWithBody(server string, contentType string, body io.Reader // NewPostPet1234RequestWithTextBody calls the generic PostPet1234 builder with text/plain body func NewPostPet1234RequestWithTextBody(server string, body PostPet1234TextRequestBody) (*http.Request, error) { var bodyReader io.Reader - if stringer, ok := interface{}(body).(fmt.Stringer); ok { + if stringer, ok := any(body).(fmt.Stringer); ok { bodyReader = strings.NewReader(stringer.String()) } else { bodyReader = strings.NewReader(fmt.Sprint(body)) diff --git a/internal/test/issues/issue-1963/issue1963.gen.go b/internal/test/issues/issue-1963/issue1963.gen.go index b2968de7b7..7984f24d5e 100644 --- a/internal/test/issues/issue-1963/issue1963.gen.go +++ b/internal/test/issues/issue-1963/issue1963.gen.go @@ -439,7 +439,7 @@ func (sh *strictHandler) BinaryEndpoint(w http.ResponseWriter, r *http.Request) request.Body = r.Body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.BinaryEndpoint(ctx, request.(BinaryEndpointRequestObject)) } for _, middleware := range sh.middlewares { @@ -474,7 +474,7 @@ func (sh *strictHandler) FormdataEndpoint(w http.ResponseWriter, r *http.Request } request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.FormdataEndpoint(ctx, request.(FormdataEndpointRequestObject)) } for _, middleware := range sh.middlewares { @@ -505,7 +505,7 @@ func (sh *strictHandler) JsonEndpoint(w http.ResponseWriter, r *http.Request) { } request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.JsonEndpoint(ctx, request.(JsonEndpointRequestObject)) } for _, middleware := range sh.middlewares { @@ -536,7 +536,7 @@ func (sh *strictHandler) MultipartEndpoint(w http.ResponseWriter, r *http.Reques request.Body = reader } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.MultipartEndpoint(ctx, request.(MultipartEndpointRequestObject)) } for _, middleware := range sh.middlewares { @@ -568,7 +568,7 @@ func (sh *strictHandler) TextEndpoint(w http.ResponseWriter, r *http.Request) { body := TextEndpointTextRequestBody(data) request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.TextEndpoint(ctx, request.(TextEndpointRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-2010/gen/spec_base/issue.gen.go b/internal/test/issues/issue-2010/gen/spec_base/issue.gen.go index 95fefde7d0..ad6f7b05b3 100644 --- a/internal/test/issues/issue-2010/gen/spec_base/issue.gen.go +++ b/internal/test/issues/issue-2010/gen/spec_base/issue.gen.go @@ -250,7 +250,7 @@ type strictHandler struct { func (sh *strictHandler) GetExample(w http.ResponseWriter, r *http.Request) { var request GetExampleRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetExample(ctx, request.(GetExampleRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-2010/gen/spec_other/issue.gen.go b/internal/test/issues/issue-2010/gen/spec_other/issue.gen.go index 1c04f58afa..7152414cbc 100644 --- a/internal/test/issues/issue-2010/gen/spec_other/issue.gen.go +++ b/internal/test/issues/issue-2010/gen/spec_other/issue.gen.go @@ -242,7 +242,7 @@ type strictHandler struct { func (sh *strictHandler) GetOtherExample(w http.ResponseWriter, r *http.Request) { var request GetOtherExampleRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetOtherExample(ctx, request.(GetOtherExampleRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-2031/issue2031.gen.go b/internal/test/issues/issue-2031/issue2031.gen.go index 1ae12da963..3fb6a11563 100644 --- a/internal/test/issues/issue-2031/issue2031.gen.go +++ b/internal/test/issues/issue-2031/issue2031.gen.go @@ -10,13 +10,13 @@ import ( // ArrayContainer defines model for ArrayContainer. type ArrayContainer struct { - Values []string `json:"values,omitempty"` - AdditionalProperties map[string]interface{} `json:"-"` + Values []string `json:"values,omitempty"` + AdditionalProperties map[string]any `json:"-"` } // Getter for additional properties for ArrayContainer. Returns the specified // element and whether it was found -func (a ArrayContainer) Get(fieldName string) (value interface{}, found bool) { +func (a ArrayContainer) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -24,9 +24,9 @@ func (a ArrayContainer) Get(fieldName string) (value interface{}, found bool) { } // Setter for additional properties for ArrayContainer -func (a *ArrayContainer) Set(fieldName string, value interface{}) { +func (a *ArrayContainer) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } @@ -48,9 +48,9 @@ func (a *ArrayContainer) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) diff --git a/internal/test/issues/issue-2113/gen/api/api.gen.go b/internal/test/issues/issue-2113/gen/api/api.gen.go index b8a5c4a533..ea89d251cc 100644 --- a/internal/test/issues/issue-2113/gen/api/api.gen.go +++ b/internal/test/issues/issue-2113/gen/api/api.gen.go @@ -267,7 +267,7 @@ type strictHandler struct { func (sh *strictHandler) ListThings(w http.ResponseWriter, r *http.Request) { var request ListThingsRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.ListThings(ctx, request.(ListThingsRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-2190/issue2190.gen.go b/internal/test/issues/issue-2190/issue2190.gen.go index 7946f27934..0fc73695a9 100644 --- a/internal/test/issues/issue-2190/issue2190.gen.go +++ b/internal/test/issues/issue-2190/issue2190.gen.go @@ -496,7 +496,7 @@ type strictHandler struct { func (sh *strictHandler) GetTest(w http.ResponseWriter, r *http.Request) { var request GetTestRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetTest(ctx, request.(GetTestRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-2308/gen/spec_base/issue.gen.go b/internal/test/issues/issue-2308/gen/spec_base/issue.gen.go index 7ec34f2efd..6e88fd7a72 100644 --- a/internal/test/issues/issue-2308/gen/spec_base/issue.gen.go +++ b/internal/test/issues/issue-2308/gen/spec_base/issue.gen.go @@ -662,7 +662,7 @@ type strictHandler struct { func (sh *strictHandler) GetV1Outcome(w http.ResponseWriter, r *http.Request) { var request GetV1OutcomeRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetV1Outcome(ctx, request.(GetV1OutcomeRequestObject)) } for _, middleware := range sh.middlewares { @@ -686,7 +686,7 @@ func (sh *strictHandler) GetV1Outcome(w http.ResponseWriter, r *http.Request) { func (sh *strictHandler) GetV1Version(w http.ResponseWriter, r *http.Request) { var request GetV1VersionRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetV1Version(ctx, request.(GetV1VersionRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-2367/api.gen.go b/internal/test/issues/issue-2367/api.gen.go index 1270af2079..48e13d2de3 100644 --- a/internal/test/issues/issue-2367/api.gen.go +++ b/internal/test/issues/issue-2367/api.gen.go @@ -153,7 +153,7 @@ type strictHandler struct { func (sh *strictHandler) GetHello(ctx *gin.Context) { var request GetHelloRequestObject - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.GetHello(ctx, request.(GetHelloRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-970/issue970.gen.go b/internal/test/issues/issue-970/issue970.gen.go index a19d0f2aae..47589c0c04 100644 --- a/internal/test/issues/issue-970/issue970.gen.go +++ b/internal/test/issues/issue-970/issue970.gen.go @@ -354,7 +354,7 @@ type strictHandler struct { func (sh *strictHandler) GetEvent(w http.ResponseWriter, r *http.Request) { var request GetEventRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetEvent(ctx, request.(GetEventRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go b/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go index 5a8e36dde0..5d0beb3ac3 100644 --- a/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go +++ b/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go @@ -300,7 +300,7 @@ type strictHandler struct { func (sh *strictHandler) PostInvalidExtRefTrouble(w http.ResponseWriter, r *http.Request) { var request PostInvalidExtRefTroubleRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.PostInvalidExtRefTrouble(ctx, request.(PostInvalidExtRefTroubleRequestObject)) } for _, middleware := range sh.middlewares { @@ -324,7 +324,7 @@ func (sh *strictHandler) PostInvalidExtRefTrouble(w http.ResponseWriter, r *http func (sh *strictHandler) PostNoTrouble(w http.ResponseWriter, r *http.Request) { var request PostNoTroubleRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.PostNoTrouble(ctx, request.(PostNoTroubleRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue1561/issue1561.gen.go b/internal/test/issues/issue1561/issue1561.gen.go index 494107b8e5..6f87151c2c 100644 --- a/internal/test/issues/issue1561/issue1561.gen.go +++ b/internal/test/issues/issue1561/issue1561.gen.go @@ -11,12 +11,12 @@ type Pong struct { // ResponseBody defines model for ResponseBody. type ResponseBody struct { - AMap map[string]Pong `json:"a_map,omitempty"` - ASlice []Pong `json:"a_slice,omitempty"` - ASliceWithAdditionalProps []map[string]Pong `json:"a_slice_with_additional_props,omitempty"` - AdditionalProps map[string]Pong `json:"additional_props,omitempty"` - Bytes []byte `json:"bytes,omitempty"` - BytesWithOverride *[]byte `json:"bytes_with_override,omitempty"` - RequiredSlice []Pong `json:"required_slice"` - UnknownObject map[string]interface{} `json:"unknown_object,omitempty"` + AMap map[string]Pong `json:"a_map,omitempty"` + ASlice []Pong `json:"a_slice,omitempty"` + ASliceWithAdditionalProps []map[string]Pong `json:"a_slice_with_additional_props,omitempty"` + AdditionalProps map[string]Pong `json:"additional_props,omitempty"` + Bytes []byte `json:"bytes,omitempty"` + BytesWithOverride *[]byte `json:"bytes_with_override,omitempty"` + RequiredSlice []Pong `json:"required_slice"` + UnknownObject map[string]any `json:"unknown_object,omitempty"` } diff --git a/internal/test/issues/issue1799/chi/out.gen.go b/internal/test/issues/issue1799/chi/out.gen.go index 29b13ef98f..40ac55f686 100644 --- a/internal/test/issues/issue1799/chi/out.gen.go +++ b/internal/test/issues/issue1799/chi/out.gen.go @@ -390,7 +390,7 @@ type strictHandler struct { func (sh *strictHandler) GetGetMultibody(w http.ResponseWriter, r *http.Request) { var request GetGetMultibodyRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetGetMultibody(ctx, request.(GetGetMultibodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -414,7 +414,7 @@ func (sh *strictHandler) GetGetMultibody(w http.ResponseWriter, r *http.Request) func (sh *strictHandler) GetObject(w http.ResponseWriter, r *http.Request) { var request GetObjectRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetObject(ctx, request.(GetObjectRequestObject)) } for _, middleware := range sh.middlewares { @@ -463,7 +463,7 @@ func (sh *strictHandler) PostPostMultibody(w http.ResponseWriter, r *http.Reques } } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.PostPostMultibody(ctx, request.(PostPostMultibodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -497,7 +497,7 @@ func (sh *strictHandler) PostPostObject(w http.ResponseWriter, r *http.Request) request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.PostPostObject(ctx, request.(PostPostObjectRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue1799/echo/out.gen.go b/internal/test/issues/issue1799/echo/out.gen.go index 846e85ae9e..81ca789d07 100644 --- a/internal/test/issues/issue1799/echo/out.gen.go +++ b/internal/test/issues/issue1799/echo/out.gen.go @@ -250,7 +250,7 @@ type strictHandler struct { func (sh *strictHandler) GetGetMultibody(ctx echo.Context) error { var request GetGetMultibodyRequestObject - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.GetGetMultibody(ctx.Request().Context(), request.(GetGetMultibodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -273,7 +273,7 @@ func (sh *strictHandler) GetGetMultibody(ctx echo.Context) error { func (sh *strictHandler) GetObject(ctx echo.Context) error { var request GetObjectRequestObject - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.GetObject(ctx.Request().Context(), request.(GetObjectRequestObject)) } for _, middleware := range sh.middlewares { @@ -317,7 +317,7 @@ func (sh *strictHandler) PostPostMultibody(ctx echo.Context) error { } } - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.PostPostMultibody(ctx.Request().Context(), request.(PostPostMultibodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -349,7 +349,7 @@ func (sh *strictHandler) PostPostObject(ctx echo.Context) error { request.Body = &body } - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.PostPostObject(ctx.Request().Context(), request.(PostPostObjectRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue1799/fiber/out.gen.go b/internal/test/issues/issue1799/fiber/out.gen.go index d2867215ad..77a0b1e45e 100644 --- a/internal/test/issues/issue1799/fiber/out.gen.go +++ b/internal/test/issues/issue1799/fiber/out.gen.go @@ -251,7 +251,7 @@ type strictHandler struct { func (sh *strictHandler) GetGetMultibody(ctx *fiber.Ctx) error { var request GetGetMultibodyRequestObject - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.GetGetMultibody(ctx.UserContext(), request.(GetGetMultibodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -276,7 +276,7 @@ func (sh *strictHandler) GetGetMultibody(ctx *fiber.Ctx) error { func (sh *strictHandler) GetObject(ctx *fiber.Ctx) error { var request GetObjectRequestObject - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.GetObject(ctx.UserContext(), request.(GetObjectRequestObject)) } for _, middleware := range sh.middlewares { @@ -324,7 +324,7 @@ func (sh *strictHandler) PostPostMultibody(ctx *fiber.Ctx) error { } } - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.PostPostMultibody(ctx.UserContext(), request.(PostPostMultibodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -358,7 +358,7 @@ func (sh *strictHandler) PostPostObject(ctx *fiber.Ctx) error { request.Body = &body } - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.PostPostObject(ctx.UserContext(), request.(PostPostObjectRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue1799/gin/out.gen.go b/internal/test/issues/issue1799/gin/out.gen.go index 38c818b9d9..e56f904d28 100644 --- a/internal/test/issues/issue1799/gin/out.gen.go +++ b/internal/test/issues/issue1799/gin/out.gen.go @@ -294,7 +294,7 @@ type strictHandler struct { func (sh *strictHandler) GetGetMultibody(ctx *gin.Context) { var request GetGetMultibodyRequestObject - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.GetGetMultibody(ctx, request.(GetGetMultibodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -318,7 +318,7 @@ func (sh *strictHandler) GetGetMultibody(ctx *gin.Context) { func (sh *strictHandler) GetObject(ctx *gin.Context) { var request GetObjectRequestObject - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.GetObject(ctx, request.(GetObjectRequestObject)) } for _, middleware := range sh.middlewares { @@ -367,7 +367,7 @@ func (sh *strictHandler) PostPostMultibody(ctx *gin.Context) { } } - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.PostPostMultibody(ctx, request.(PostPostMultibodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -401,7 +401,7 @@ func (sh *strictHandler) PostPostObject(ctx *gin.Context) { request.Body = &body } - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.PostPostObject(ctx, request.(PostPostObjectRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue1799/gorilla/out.gen.go b/internal/test/issues/issue1799/gorilla/out.gen.go index 254b183a01..b1cf21cb1a 100644 --- a/internal/test/issues/issue1799/gorilla/out.gen.go +++ b/internal/test/issues/issue1799/gorilla/out.gen.go @@ -361,7 +361,7 @@ type strictHandler struct { func (sh *strictHandler) GetGetMultibody(w http.ResponseWriter, r *http.Request) { var request GetGetMultibodyRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetGetMultibody(ctx, request.(GetGetMultibodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -385,7 +385,7 @@ func (sh *strictHandler) GetGetMultibody(w http.ResponseWriter, r *http.Request) func (sh *strictHandler) GetObject(w http.ResponseWriter, r *http.Request) { var request GetObjectRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetObject(ctx, request.(GetObjectRequestObject)) } for _, middleware := range sh.middlewares { @@ -434,7 +434,7 @@ func (sh *strictHandler) PostPostMultibody(w http.ResponseWriter, r *http.Reques } } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.PostPostMultibody(ctx, request.(PostPostMultibodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -468,7 +468,7 @@ func (sh *strictHandler) PostPostObject(w http.ResponseWriter, r *http.Request) request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.PostPostObject(ctx, request.(PostPostObjectRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue1799/iris/out.gen.go b/internal/test/issues/issue1799/iris/out.gen.go index d57447cbae..a6985b5451 100644 --- a/internal/test/issues/issue1799/iris/out.gen.go +++ b/internal/test/issues/issue1799/iris/out.gen.go @@ -198,7 +198,7 @@ type strictHandler struct { func (sh *strictHandler) GetGetMultibody(ctx iris.Context) { var request GetGetMultibodyRequestObject - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.GetGetMultibody(ctx, request.(GetGetMultibodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -225,7 +225,7 @@ func (sh *strictHandler) GetGetMultibody(ctx iris.Context) { func (sh *strictHandler) GetObject(ctx iris.Context) { var request GetObjectRequestObject - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.GetObject(ctx, request.(GetObjectRequestObject)) } for _, middleware := range sh.middlewares { @@ -277,7 +277,7 @@ func (sh *strictHandler) PostPostMultibody(ctx iris.Context) { } } - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.PostPostMultibody(ctx, request.(PostPostMultibodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -314,7 +314,7 @@ func (sh *strictHandler) PostPostObject(ctx iris.Context) { request.Body = &body } - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.PostPostObject(ctx, request.(PostPostObjectRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue1799/std-http/out.gen.go b/internal/test/issues/issue1799/std-http/out.gen.go index 4fc5ab39c0..46d5dec6cd 100644 --- a/internal/test/issues/issue1799/std-http/out.gen.go +++ b/internal/test/issues/issue1799/std-http/out.gen.go @@ -365,7 +365,7 @@ type strictHandler struct { func (sh *strictHandler) GetGetMultibody(w http.ResponseWriter, r *http.Request) { var request GetGetMultibodyRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetGetMultibody(ctx, request.(GetGetMultibodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -389,7 +389,7 @@ func (sh *strictHandler) GetGetMultibody(w http.ResponseWriter, r *http.Request) func (sh *strictHandler) GetObject(w http.ResponseWriter, r *http.Request) { var request GetObjectRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.GetObject(ctx, request.(GetObjectRequestObject)) } for _, middleware := range sh.middlewares { @@ -438,7 +438,7 @@ func (sh *strictHandler) PostPostMultibody(w http.ResponseWriter, r *http.Reques } } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.PostPostMultibody(ctx, request.(PostPostMultibodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -472,7 +472,7 @@ func (sh *strictHandler) PostPostObject(w http.ResponseWriter, r *http.Request) request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.PostPostObject(ctx, request.(PostPostObjectRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/issues/issue1825/issue1825.gen.go b/internal/test/issues/issue1825/issue1825.gen.go index c8c5a18a5b..46d3ca7fa1 100644 --- a/internal/test/issues/issue1825/issue1825.gen.go +++ b/internal/test/issues/issue1825/issue1825.gen.go @@ -18,8 +18,8 @@ import ( // Container defines model for Container. type Container struct { - ObjectA *externalRef0.ObjectA `json:"object_a,omitempty"` - ObjectB *map[string]interface{} `json:"object_b,omitempty"` + ObjectA *externalRef0.ObjectA `json:"object_a,omitempty"` + ObjectB *map[string]any `json:"object_b,omitempty"` } // Base64 encoded, compressed with deflate, json marshaled OpenAPI spec. diff --git a/internal/test/issues/issue193/issue.gen.go b/internal/test/issues/issue193/issue.gen.go index eec8a25dfc..4a24a3ffc2 100644 --- a/internal/test/issues/issue193/issue.gen.go +++ b/internal/test/issues/issue193/issue.gen.go @@ -10,15 +10,15 @@ import ( // Person defines model for Person. type Person struct { - Age *float32 `json:"age,omitempty"` - Metadata string `json:"metadata"` - Name *string `json:"name,omitempty"` - AdditionalProperties map[string]interface{} `json:"-"` + Age *float32 `json:"age,omitempty"` + Metadata string `json:"metadata"` + Name *string `json:"name,omitempty"` + AdditionalProperties map[string]any `json:"-"` } // Getter for additional properties for Person. Returns the specified // element and whether it was found -func (a Person) Get(fieldName string) (value interface{}, found bool) { +func (a Person) Get(fieldName string) (value any, found bool) { if a.AdditionalProperties != nil { value, found = a.AdditionalProperties[fieldName] } @@ -26,9 +26,9 @@ func (a Person) Get(fieldName string) (value interface{}, found bool) { } // Setter for additional properties for Person -func (a *Person) Set(fieldName string, value interface{}) { +func (a *Person) Set(fieldName string, value any) { if a.AdditionalProperties == nil { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) } a.AdditionalProperties[fieldName] = value } @@ -66,9 +66,9 @@ func (a *Person) UnmarshalJSON(b []byte) error { } if len(object) != 0 { - a.AdditionalProperties = make(map[string]interface{}) + a.AdditionalProperties = make(map[string]any) for fieldName, fieldBuf := range object { - var fieldVal interface{} + var fieldVal any err := json.Unmarshal(fieldBuf, &fieldVal) if err != nil { return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err) diff --git a/internal/test/issues/issue609/issue609.gen.go b/internal/test/issues/issue609/issue609.gen.go index a5d76e500d..95cb239957 100644 --- a/internal/test/issues/issue609/issue609.gen.go +++ b/internal/test/issues/issue609/issue609.gen.go @@ -5,5 +5,5 @@ package issue609 // ResponseBody defines model for ResponseBody. type ResponseBody struct { - Unknown interface{} `json:"unknown,omitempty"` + Unknown any `json:"unknown,omitempty"` } diff --git a/internal/test/openapi31_nullable/openapi31_nullable_test.go b/internal/test/openapi31_nullable/openapi31_nullable_test.go index 22ad21ef9c..5a41f7538f 100644 --- a/internal/test/openapi31_nullable/openapi31_nullable_test.go +++ b/internal/test/openapi31_nullable/openapi31_nullable_test.go @@ -104,7 +104,7 @@ func TestNullableArrayAndObjectFields_3_0(t *testing.T) { // TestNullableUnspecifiedObject_3_1 asserts that a bare nullable // object (`type: ["object","null"]` with no `properties:`) generates -// as `*map[string]interface{}`. This is the gap flagged in the +// as `*map[string]any`. This is the gap flagged in the // kin-openapi-3.1 PR review: `Schema.Is(...)` strict equality on a // 3.1 type-array failed to recognize the primary type as "object", // routing the schema away from the unspecified-object code path. @@ -112,8 +112,8 @@ func TestNullableArrayAndObjectFields_3_0(t *testing.T) { // (`type: ["null","object"]`) resolves identically -- no code path // may peek only at the first element of the array. func TestNullableUnspecifiedObject_3_1(t *testing.T) { - extras := map[string]interface{}{"k": "v"} - metadata := map[string]interface{}{"j": float64(1)} + extras := map[string]any{"k": "v"} + metadata := map[string]any{"j": float64(1)} p := spec31.Pet{ Name: "fluffy", Extras: &extras, @@ -133,7 +133,7 @@ func TestNullableUnspecifiedObject_3_1(t *testing.T) { // TestNullableUnspecifiedObject_3_0 is the matching 3.0 control case // asserting parity with the 3.1 type-array form. func TestNullableUnspecifiedObject_3_0(t *testing.T) { - extras := map[string]interface{}{"k": "v"} + extras := map[string]any{"k": "v"} p := spec30.Pet{ Name: "fluffy", Extras: &extras, diff --git a/internal/test/openapi31_nullable/spec_3_0.yaml b/internal/test/openapi31_nullable/spec_3_0.yaml index 8ede3dbc17..58d5027fae 100644 --- a/internal/test/openapi31_nullable/spec_3_0.yaml +++ b/internal/test/openapi31_nullable/spec_3_0.yaml @@ -40,4 +40,4 @@ components: description: | Optional, nullable *unspecified* object (no `properties:`). 3.0 control case for the 3.1 `type: ["object","null"]` - equivalent; expected shape: `*map[string]interface{}`. + equivalent; expected shape: `*map[string]any`. diff --git a/internal/test/openapi31_nullable/spec_3_0/types.gen.go b/internal/test/openapi31_nullable/spec_3_0/types.gen.go index b9dd7df8ee..83f5a1dfc7 100644 --- a/internal/test/openapi31_nullable/spec_3_0/types.gen.go +++ b/internal/test/openapi31_nullable/spec_3_0/types.gen.go @@ -8,7 +8,7 @@ type Pet struct { // Extras Optional, nullable *unspecified* object (no `properties:`). // 3.0 control case for the 3.1 `type: ["object","null"]` // equivalent; expected shape: `*map[string]interface{}`. - Extras *map[string]interface{} `json:"extras,omitempty"` + Extras *map[string]any `json:"extras,omitempty"` // Name Required, non-nullable. Name string `json:"name"` diff --git a/internal/test/openapi31_nullable/spec_3_1.yaml b/internal/test/openapi31_nullable/spec_3_1.yaml index cea52ed852..6a79677d49 100644 --- a/internal/test/openapi31_nullable/spec_3_1.yaml +++ b/internal/test/openapi31_nullable/spec_3_1.yaml @@ -39,7 +39,7 @@ components: equality on a 3.1 type-array failed to recognize the primary type as "object", routing the schema away from the unspecified-object code path. Expected shape: - `*map[string]interface{}`. + `*map[string]any`. metadata: type: ["null", "object"] description: | diff --git a/internal/test/openapi31_nullable/spec_3_1/types.gen.go b/internal/test/openapi31_nullable/spec_3_1/types.gen.go index 8d4d54d31d..b32977610d 100644 --- a/internal/test/openapi31_nullable/spec_3_1/types.gen.go +++ b/internal/test/openapi31_nullable/spec_3_1/types.gen.go @@ -35,7 +35,7 @@ type Pet struct { // primary type as "object", routing the schema away from // the unspecified-object code path. Expected shape: // `*map[string]interface{}`. - Extras *map[string]interface{} `json:"extras,omitempty"` + Extras *map[string]any `json:"extras,omitempty"` // Favorite Nullable discriminated union (`oneOf: [Cat, Dog, null]` with a // discriminator). Before this branch's fix to the union- @@ -50,7 +50,7 @@ type Pet struct { // Both orderings must resolve identically; this guards // against any code path that inspects only the first // element of the type array. - Metadata *map[string]interface{} `json:"metadata,omitempty"` + Metadata *map[string]any `json:"metadata,omitempty"` // Name Required, non-nullable. Name string `json:"name"` @@ -141,7 +141,7 @@ func (t DiscriminatedPet) Discriminator() (string, error) { return discriminator.Discriminator, err } -func (t DiscriminatedPet) ValueByDiscriminator() (interface{}, error) { +func (t DiscriminatedPet) ValueByDiscriminator() (any, error) { discriminator, err := t.Discriminator() if err != nil { return nil, err diff --git a/internal/test/parameters/chi/server.go b/internal/test/parameters/chi/server.go index 407710288c..0e4e06a993 100644 --- a/internal/test/parameters/chi/server.go +++ b/internal/test/parameters/chi/server.go @@ -14,35 +14,89 @@ type Server struct{} var _ gen.ServerInterface = (*Server)(nil) -func writeJSON(w http.ResponseWriter, v interface{}) { +func writeJSON(w http.ResponseWriter, v any) { w.Header().Set("Content-Type", "application/json") _ = json.NewEncoder(w).Encode(v) } -func (s *Server) GetContentObject(w http.ResponseWriter, r *http.Request, param gen.ComplexObject) { writeJSON(w, param) } -func (s *Server) GetCookie(w http.ResponseWriter, r *http.Request, params gen.GetCookieParams) { writeJSON(w, params) } -func (s *Server) EnumParams(w http.ResponseWriter, r *http.Request, params gen.EnumParamsParams) { w.WriteHeader(http.StatusNoContent) } -func (s *Server) GetHeader(w http.ResponseWriter, r *http.Request, params gen.GetHeaderParams) { writeJSON(w, params) } -func (s *Server) GetLabelExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { writeJSON(w, param) } -func (s *Server) GetLabelExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { writeJSON(w, param) } -func (s *Server) GetLabelExplodePrimitive(w http.ResponseWriter, r *http.Request, param int32) { writeJSON(w, param) } -func (s *Server) GetLabelNoExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { writeJSON(w, param) } -func (s *Server) GetLabelNoExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { writeJSON(w, param) } -func (s *Server) GetLabelPrimitive(w http.ResponseWriter, r *http.Request, param int32) { writeJSON(w, param) } -func (s *Server) GetMatrixExplodeArray(w http.ResponseWriter, r *http.Request, id []int32) { writeJSON(w, id) } -func (s *Server) GetMatrixExplodeObject(w http.ResponseWriter, r *http.Request, id gen.Object) { writeJSON(w, id) } -func (s *Server) GetMatrixExplodePrimitive(w http.ResponseWriter, r *http.Request, id int32) { writeJSON(w, id) } -func (s *Server) GetMatrixNoExplodeArray(w http.ResponseWriter, r *http.Request, id []int32) { writeJSON(w, id) } -func (s *Server) GetMatrixNoExplodeObject(w http.ResponseWriter, r *http.Request, id gen.Object) { writeJSON(w, id) } -func (s *Server) GetMatrixPrimitive(w http.ResponseWriter, r *http.Request, id int32) { writeJSON(w, id) } -func (s *Server) GetPassThrough(w http.ResponseWriter, r *http.Request, param string) { writeJSON(w, param) } -func (s *Server) GetDeepObject(w http.ResponseWriter, r *http.Request, params gen.GetDeepObjectParams) { writeJSON(w, params) } -func (s *Server) GetQueryDelimited(w http.ResponseWriter, r *http.Request, params gen.GetQueryDelimitedParams) { writeJSON(w, params) } -func (s *Server) GetQueryForm(w http.ResponseWriter, r *http.Request, params gen.GetQueryFormParams) { writeJSON(w, params) } -func (s *Server) GetSimpleExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { writeJSON(w, param) } -func (s *Server) GetSimpleExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { writeJSON(w, param) } -func (s *Server) GetSimpleExplodePrimitive(w http.ResponseWriter, r *http.Request, param int32) { writeJSON(w, param) } -func (s *Server) GetSimpleNoExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { writeJSON(w, param) } -func (s *Server) GetSimpleNoExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { writeJSON(w, param) } -func (s *Server) GetSimplePrimitive(w http.ResponseWriter, r *http.Request, param int32) { writeJSON(w, param) } -func (s *Server) GetStartingWithNumber(w http.ResponseWriter, r *http.Request, n1param string) { writeJSON(w, n1param) } +func (s *Server) GetContentObject(w http.ResponseWriter, r *http.Request, param gen.ComplexObject) { + writeJSON(w, param) +} +func (s *Server) GetCookie(w http.ResponseWriter, r *http.Request, params gen.GetCookieParams) { + writeJSON(w, params) +} +func (s *Server) EnumParams(w http.ResponseWriter, r *http.Request, params gen.EnumParamsParams) { + w.WriteHeader(http.StatusNoContent) +} +func (s *Server) GetHeader(w http.ResponseWriter, r *http.Request, params gen.GetHeaderParams) { + writeJSON(w, params) +} +func (s *Server) GetLabelExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { + writeJSON(w, param) +} +func (s *Server) GetLabelExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { + writeJSON(w, param) +} +func (s *Server) GetLabelExplodePrimitive(w http.ResponseWriter, r *http.Request, param int32) { + writeJSON(w, param) +} +func (s *Server) GetLabelNoExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { + writeJSON(w, param) +} +func (s *Server) GetLabelNoExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { + writeJSON(w, param) +} +func (s *Server) GetLabelPrimitive(w http.ResponseWriter, r *http.Request, param int32) { + writeJSON(w, param) +} +func (s *Server) GetMatrixExplodeArray(w http.ResponseWriter, r *http.Request, id []int32) { + writeJSON(w, id) +} +func (s *Server) GetMatrixExplodeObject(w http.ResponseWriter, r *http.Request, id gen.Object) { + writeJSON(w, id) +} +func (s *Server) GetMatrixExplodePrimitive(w http.ResponseWriter, r *http.Request, id int32) { + writeJSON(w, id) +} +func (s *Server) GetMatrixNoExplodeArray(w http.ResponseWriter, r *http.Request, id []int32) { + writeJSON(w, id) +} +func (s *Server) GetMatrixNoExplodeObject(w http.ResponseWriter, r *http.Request, id gen.Object) { + writeJSON(w, id) +} +func (s *Server) GetMatrixPrimitive(w http.ResponseWriter, r *http.Request, id int32) { + writeJSON(w, id) +} +func (s *Server) GetPassThrough(w http.ResponseWriter, r *http.Request, param string) { + writeJSON(w, param) +} +func (s *Server) GetDeepObject(w http.ResponseWriter, r *http.Request, params gen.GetDeepObjectParams) { + writeJSON(w, params) +} +func (s *Server) GetQueryDelimited(w http.ResponseWriter, r *http.Request, params gen.GetQueryDelimitedParams) { + writeJSON(w, params) +} +func (s *Server) GetQueryForm(w http.ResponseWriter, r *http.Request, params gen.GetQueryFormParams) { + writeJSON(w, params) +} +func (s *Server) GetSimpleExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { + writeJSON(w, param) +} +func (s *Server) GetSimpleExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { + writeJSON(w, param) +} +func (s *Server) GetSimpleExplodePrimitive(w http.ResponseWriter, r *http.Request, param int32) { + writeJSON(w, param) +} +func (s *Server) GetSimpleNoExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { + writeJSON(w, param) +} +func (s *Server) GetSimpleNoExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { + writeJSON(w, param) +} +func (s *Server) GetSimplePrimitive(w http.ResponseWriter, r *http.Request, param int32) { + writeJSON(w, param) +} +func (s *Server) GetStartingWithNumber(w http.ResponseWriter, r *http.Request, n1param string) { + writeJSON(w, n1param) +} diff --git a/internal/test/parameters/gorilla/server.go b/internal/test/parameters/gorilla/server.go index afdde25e25..6b3a85fa23 100644 --- a/internal/test/parameters/gorilla/server.go +++ b/internal/test/parameters/gorilla/server.go @@ -14,35 +14,89 @@ type Server struct{} var _ gen.ServerInterface = (*Server)(nil) -func writeJSON(w http.ResponseWriter, v interface{}) { +func writeJSON(w http.ResponseWriter, v any) { w.Header().Set("Content-Type", "application/json") _ = json.NewEncoder(w).Encode(v) } -func (s *Server) GetContentObject(w http.ResponseWriter, r *http.Request, param gen.ComplexObject) { writeJSON(w, param) } -func (s *Server) GetCookie(w http.ResponseWriter, r *http.Request, params gen.GetCookieParams) { writeJSON(w, params) } -func (s *Server) EnumParams(w http.ResponseWriter, r *http.Request, params gen.EnumParamsParams) { w.WriteHeader(http.StatusNoContent) } -func (s *Server) GetHeader(w http.ResponseWriter, r *http.Request, params gen.GetHeaderParams) { writeJSON(w, params) } -func (s *Server) GetLabelExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { writeJSON(w, param) } -func (s *Server) GetLabelExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { writeJSON(w, param) } -func (s *Server) GetLabelExplodePrimitive(w http.ResponseWriter, r *http.Request, param int32) { writeJSON(w, param) } -func (s *Server) GetLabelNoExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { writeJSON(w, param) } -func (s *Server) GetLabelNoExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { writeJSON(w, param) } -func (s *Server) GetLabelPrimitive(w http.ResponseWriter, r *http.Request, param int32) { writeJSON(w, param) } -func (s *Server) GetMatrixExplodeArray(w http.ResponseWriter, r *http.Request, id []int32) { writeJSON(w, id) } -func (s *Server) GetMatrixExplodeObject(w http.ResponseWriter, r *http.Request, id gen.Object) { writeJSON(w, id) } -func (s *Server) GetMatrixExplodePrimitive(w http.ResponseWriter, r *http.Request, id int32) { writeJSON(w, id) } -func (s *Server) GetMatrixNoExplodeArray(w http.ResponseWriter, r *http.Request, id []int32) { writeJSON(w, id) } -func (s *Server) GetMatrixNoExplodeObject(w http.ResponseWriter, r *http.Request, id gen.Object) { writeJSON(w, id) } -func (s *Server) GetMatrixPrimitive(w http.ResponseWriter, r *http.Request, id int32) { writeJSON(w, id) } -func (s *Server) GetPassThrough(w http.ResponseWriter, r *http.Request, param string) { writeJSON(w, param) } -func (s *Server) GetDeepObject(w http.ResponseWriter, r *http.Request, params gen.GetDeepObjectParams) { writeJSON(w, params) } -func (s *Server) GetQueryDelimited(w http.ResponseWriter, r *http.Request, params gen.GetQueryDelimitedParams) { writeJSON(w, params) } -func (s *Server) GetQueryForm(w http.ResponseWriter, r *http.Request, params gen.GetQueryFormParams) { writeJSON(w, params) } -func (s *Server) GetSimpleExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { writeJSON(w, param) } -func (s *Server) GetSimpleExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { writeJSON(w, param) } -func (s *Server) GetSimpleExplodePrimitive(w http.ResponseWriter, r *http.Request, param int32) { writeJSON(w, param) } -func (s *Server) GetSimpleNoExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { writeJSON(w, param) } -func (s *Server) GetSimpleNoExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { writeJSON(w, param) } -func (s *Server) GetSimplePrimitive(w http.ResponseWriter, r *http.Request, param int32) { writeJSON(w, param) } -func (s *Server) GetStartingWithNumber(w http.ResponseWriter, r *http.Request, n1param string) { writeJSON(w, n1param) } +func (s *Server) GetContentObject(w http.ResponseWriter, r *http.Request, param gen.ComplexObject) { + writeJSON(w, param) +} +func (s *Server) GetCookie(w http.ResponseWriter, r *http.Request, params gen.GetCookieParams) { + writeJSON(w, params) +} +func (s *Server) EnumParams(w http.ResponseWriter, r *http.Request, params gen.EnumParamsParams) { + w.WriteHeader(http.StatusNoContent) +} +func (s *Server) GetHeader(w http.ResponseWriter, r *http.Request, params gen.GetHeaderParams) { + writeJSON(w, params) +} +func (s *Server) GetLabelExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { + writeJSON(w, param) +} +func (s *Server) GetLabelExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { + writeJSON(w, param) +} +func (s *Server) GetLabelExplodePrimitive(w http.ResponseWriter, r *http.Request, param int32) { + writeJSON(w, param) +} +func (s *Server) GetLabelNoExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { + writeJSON(w, param) +} +func (s *Server) GetLabelNoExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { + writeJSON(w, param) +} +func (s *Server) GetLabelPrimitive(w http.ResponseWriter, r *http.Request, param int32) { + writeJSON(w, param) +} +func (s *Server) GetMatrixExplodeArray(w http.ResponseWriter, r *http.Request, id []int32) { + writeJSON(w, id) +} +func (s *Server) GetMatrixExplodeObject(w http.ResponseWriter, r *http.Request, id gen.Object) { + writeJSON(w, id) +} +func (s *Server) GetMatrixExplodePrimitive(w http.ResponseWriter, r *http.Request, id int32) { + writeJSON(w, id) +} +func (s *Server) GetMatrixNoExplodeArray(w http.ResponseWriter, r *http.Request, id []int32) { + writeJSON(w, id) +} +func (s *Server) GetMatrixNoExplodeObject(w http.ResponseWriter, r *http.Request, id gen.Object) { + writeJSON(w, id) +} +func (s *Server) GetMatrixPrimitive(w http.ResponseWriter, r *http.Request, id int32) { + writeJSON(w, id) +} +func (s *Server) GetPassThrough(w http.ResponseWriter, r *http.Request, param string) { + writeJSON(w, param) +} +func (s *Server) GetDeepObject(w http.ResponseWriter, r *http.Request, params gen.GetDeepObjectParams) { + writeJSON(w, params) +} +func (s *Server) GetQueryDelimited(w http.ResponseWriter, r *http.Request, params gen.GetQueryDelimitedParams) { + writeJSON(w, params) +} +func (s *Server) GetQueryForm(w http.ResponseWriter, r *http.Request, params gen.GetQueryFormParams) { + writeJSON(w, params) +} +func (s *Server) GetSimpleExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { + writeJSON(w, param) +} +func (s *Server) GetSimpleExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { + writeJSON(w, param) +} +func (s *Server) GetSimpleExplodePrimitive(w http.ResponseWriter, r *http.Request, param int32) { + writeJSON(w, param) +} +func (s *Server) GetSimpleNoExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { + writeJSON(w, param) +} +func (s *Server) GetSimpleNoExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { + writeJSON(w, param) +} +func (s *Server) GetSimplePrimitive(w http.ResponseWriter, r *http.Request, param int32) { + writeJSON(w, param) +} +func (s *Server) GetStartingWithNumber(w http.ResponseWriter, r *http.Request, n1param string) { + writeJSON(w, n1param) +} diff --git a/internal/test/parameters/stdhttp/server.go b/internal/test/parameters/stdhttp/server.go index 2b1d3b7261..a7613ba6cb 100644 --- a/internal/test/parameters/stdhttp/server.go +++ b/internal/test/parameters/stdhttp/server.go @@ -14,35 +14,89 @@ type Server struct{} var _ gen.ServerInterface = (*Server)(nil) -func writeJSON(w http.ResponseWriter, v interface{}) { +func writeJSON(w http.ResponseWriter, v any) { w.Header().Set("Content-Type", "application/json") _ = json.NewEncoder(w).Encode(v) } -func (s *Server) GetContentObject(w http.ResponseWriter, r *http.Request, param gen.ComplexObject) { writeJSON(w, param) } -func (s *Server) GetCookie(w http.ResponseWriter, r *http.Request, params gen.GetCookieParams) { writeJSON(w, params) } -func (s *Server) EnumParams(w http.ResponseWriter, r *http.Request, params gen.EnumParamsParams) { w.WriteHeader(http.StatusNoContent) } -func (s *Server) GetHeader(w http.ResponseWriter, r *http.Request, params gen.GetHeaderParams) { writeJSON(w, params) } -func (s *Server) GetLabelExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { writeJSON(w, param) } -func (s *Server) GetLabelExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { writeJSON(w, param) } -func (s *Server) GetLabelExplodePrimitive(w http.ResponseWriter, r *http.Request, param int32) { writeJSON(w, param) } -func (s *Server) GetLabelNoExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { writeJSON(w, param) } -func (s *Server) GetLabelNoExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { writeJSON(w, param) } -func (s *Server) GetLabelPrimitive(w http.ResponseWriter, r *http.Request, param int32) { writeJSON(w, param) } -func (s *Server) GetMatrixExplodeArray(w http.ResponseWriter, r *http.Request, id []int32) { writeJSON(w, id) } -func (s *Server) GetMatrixExplodeObject(w http.ResponseWriter, r *http.Request, id gen.Object) { writeJSON(w, id) } -func (s *Server) GetMatrixExplodePrimitive(w http.ResponseWriter, r *http.Request, id int32) { writeJSON(w, id) } -func (s *Server) GetMatrixNoExplodeArray(w http.ResponseWriter, r *http.Request, id []int32) { writeJSON(w, id) } -func (s *Server) GetMatrixNoExplodeObject(w http.ResponseWriter, r *http.Request, id gen.Object) { writeJSON(w, id) } -func (s *Server) GetMatrixPrimitive(w http.ResponseWriter, r *http.Request, id int32) { writeJSON(w, id) } -func (s *Server) GetPassThrough(w http.ResponseWriter, r *http.Request, param string) { writeJSON(w, param) } -func (s *Server) GetDeepObject(w http.ResponseWriter, r *http.Request, params gen.GetDeepObjectParams) { writeJSON(w, params) } -func (s *Server) GetQueryDelimited(w http.ResponseWriter, r *http.Request, params gen.GetQueryDelimitedParams) { writeJSON(w, params) } -func (s *Server) GetQueryForm(w http.ResponseWriter, r *http.Request, params gen.GetQueryFormParams) { writeJSON(w, params) } -func (s *Server) GetSimpleExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { writeJSON(w, param) } -func (s *Server) GetSimpleExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { writeJSON(w, param) } -func (s *Server) GetSimpleExplodePrimitive(w http.ResponseWriter, r *http.Request, param int32) { writeJSON(w, param) } -func (s *Server) GetSimpleNoExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { writeJSON(w, param) } -func (s *Server) GetSimpleNoExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { writeJSON(w, param) } -func (s *Server) GetSimplePrimitive(w http.ResponseWriter, r *http.Request, param int32) { writeJSON(w, param) } -func (s *Server) GetStartingWithNumber(w http.ResponseWriter, r *http.Request, n1param string) { writeJSON(w, n1param) } +func (s *Server) GetContentObject(w http.ResponseWriter, r *http.Request, param gen.ComplexObject) { + writeJSON(w, param) +} +func (s *Server) GetCookie(w http.ResponseWriter, r *http.Request, params gen.GetCookieParams) { + writeJSON(w, params) +} +func (s *Server) EnumParams(w http.ResponseWriter, r *http.Request, params gen.EnumParamsParams) { + w.WriteHeader(http.StatusNoContent) +} +func (s *Server) GetHeader(w http.ResponseWriter, r *http.Request, params gen.GetHeaderParams) { + writeJSON(w, params) +} +func (s *Server) GetLabelExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { + writeJSON(w, param) +} +func (s *Server) GetLabelExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { + writeJSON(w, param) +} +func (s *Server) GetLabelExplodePrimitive(w http.ResponseWriter, r *http.Request, param int32) { + writeJSON(w, param) +} +func (s *Server) GetLabelNoExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { + writeJSON(w, param) +} +func (s *Server) GetLabelNoExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { + writeJSON(w, param) +} +func (s *Server) GetLabelPrimitive(w http.ResponseWriter, r *http.Request, param int32) { + writeJSON(w, param) +} +func (s *Server) GetMatrixExplodeArray(w http.ResponseWriter, r *http.Request, id []int32) { + writeJSON(w, id) +} +func (s *Server) GetMatrixExplodeObject(w http.ResponseWriter, r *http.Request, id gen.Object) { + writeJSON(w, id) +} +func (s *Server) GetMatrixExplodePrimitive(w http.ResponseWriter, r *http.Request, id int32) { + writeJSON(w, id) +} +func (s *Server) GetMatrixNoExplodeArray(w http.ResponseWriter, r *http.Request, id []int32) { + writeJSON(w, id) +} +func (s *Server) GetMatrixNoExplodeObject(w http.ResponseWriter, r *http.Request, id gen.Object) { + writeJSON(w, id) +} +func (s *Server) GetMatrixPrimitive(w http.ResponseWriter, r *http.Request, id int32) { + writeJSON(w, id) +} +func (s *Server) GetPassThrough(w http.ResponseWriter, r *http.Request, param string) { + writeJSON(w, param) +} +func (s *Server) GetDeepObject(w http.ResponseWriter, r *http.Request, params gen.GetDeepObjectParams) { + writeJSON(w, params) +} +func (s *Server) GetQueryDelimited(w http.ResponseWriter, r *http.Request, params gen.GetQueryDelimitedParams) { + writeJSON(w, params) +} +func (s *Server) GetQueryForm(w http.ResponseWriter, r *http.Request, params gen.GetQueryFormParams) { + writeJSON(w, params) +} +func (s *Server) GetSimpleExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { + writeJSON(w, param) +} +func (s *Server) GetSimpleExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { + writeJSON(w, param) +} +func (s *Server) GetSimpleExplodePrimitive(w http.ResponseWriter, r *http.Request, param int32) { + writeJSON(w, param) +} +func (s *Server) GetSimpleNoExplodeArray(w http.ResponseWriter, r *http.Request, param []int32) { + writeJSON(w, param) +} +func (s *Server) GetSimpleNoExplodeObject(w http.ResponseWriter, r *http.Request, param gen.Object) { + writeJSON(w, param) +} +func (s *Server) GetSimplePrimitive(w http.ResponseWriter, r *http.Request, param int32) { + writeJSON(w, param) +} +func (s *Server) GetStartingWithNumber(w http.ResponseWriter, r *http.Request, n1param string) { + writeJSON(w, n1param) +} diff --git a/internal/test/schemas/schemas.gen.go b/internal/test/schemas/schemas.gen.go index c07b3536d6..b5cf4215df 100644 --- a/internal/test/schemas/schemas.gen.go +++ b/internal/test/schemas/schemas.gen.go @@ -47,15 +47,15 @@ func (e EnumInObjInArrayVal) Valid() bool { } // N5StartsWithNumber This schema name starts with a number -type N5StartsWithNumber = map[string]interface{} +type N5StartsWithNumber = map[string]any // AnyType1 defines model for AnyType1. -type AnyType1 = interface{} +type AnyType1 = any // AnyType2 AnyType2 represents any type. // // This should be an interface{} -type AnyType2 = interface{} +type AnyType2 = any // CustomStringType defines model for CustomStringType. type CustomStringType = string @@ -87,7 +87,7 @@ type EnumInObjInArray = []struct { type EnumInObjInArrayVal string // GenericObject defines model for GenericObject. -type GenericObject = map[string]interface{} +type GenericObject = map[string]any // NullableProperties defines model for NullableProperties. type NullableProperties struct { @@ -115,7 +115,7 @@ type StringInPath = string type accessTokenContextKey string // Issue9JSONBody defines parameters for Issue9. -type Issue9JSONBody = interface{} +type Issue9JSONBody = any // Issue9Params defines parameters for Issue9. type Issue9Params struct { @@ -987,18 +987,18 @@ type Issue1051Response struct { Body []byte HTTPResponse *http.Response // JSON200 the response for an HTTP 200 `application/json` response - JSON200 *map[string]interface{} + JSON200 *map[string]any // ApplicationvndSomethingV1JSON200 the response for an HTTP 200 `application/vnd.something.v1+json` response - ApplicationvndSomethingV1JSON200 *map[string]interface{} + ApplicationvndSomethingV1JSON200 *map[string]any } // GetJSON200 returns the response for an HTTP 200 `application/json` response -func (r Issue1051Response) GetJSON200() *map[string]interface{} { +func (r Issue1051Response) GetJSON200() *map[string]any { return r.JSON200 } // GetApplicationvndSomethingV1JSON200 returns the response for an HTTP 200 `application/vnd.something.v1+json` response -func (r Issue1051Response) GetApplicationvndSomethingV1JSON200() *map[string]interface{} { +func (r Issue1051Response) GetApplicationvndSomethingV1JSON200() *map[string]any { return r.ApplicationvndSomethingV1JSON200 } @@ -1552,14 +1552,14 @@ func ParseIssue1051Response(rsp *http.Response) (*Issue1051Response, error) { switch { case rsp.Header.Get("Content-Type") == "application/json" && rsp.StatusCode == 200: - var dest map[string]interface{} + var dest map[string]any if err := json.Unmarshal(bodyBytes, &dest); err != nil { return nil, err } response.JSON200 = &dest case rsp.Header.Get("Content-Type") == "application/vnd.something.v1+json" && rsp.StatusCode == 200: - var dest map[string]interface{} + var dest map[string]any if err := json.Unmarshal(bodyBytes, &dest); err != nil { return nil, err } diff --git a/internal/test/schemas/schemas.yaml b/internal/test/schemas/schemas.yaml index 2e094de126..cd9e67b2fa 100644 --- a/internal/test/schemas/schemas.yaml +++ b/internal/test/schemas/schemas.yaml @@ -156,7 +156,7 @@ components: description: | AnyType2 represents any type. - This should be an interface{} + This should be `any` CustomStringType: type: string format: custom diff --git a/internal/test/strict-server/chi/server.gen.go b/internal/test/strict-server/chi/server.gen.go index f54a6191ed..5dd25b21ba 100644 --- a/internal/test/strict-server/chi/server.gen.go +++ b/internal/test/strict-server/chi/server.gen.go @@ -1362,7 +1362,7 @@ func (sh *strictHandler) JSONExample(w http.ResponseWriter, r *http.Request) { request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.JSONExample(ctx, request.(JSONExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1393,7 +1393,7 @@ func (sh *strictHandler) MultipartExample(w http.ResponseWriter, r *http.Request request.Body = reader } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.MultipartExample(ctx, request.(MultipartExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1427,7 +1427,7 @@ func (sh *strictHandler) MultipartRelatedExample(w http.ResponseWriter, r *http. request.Body = multipart.NewReader(r.Body, boundary) } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.MultipartRelatedExample(ctx, request.(MultipartRelatedExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1498,7 +1498,7 @@ func (sh *strictHandler) MultipleRequestAndResponseTypes(w http.ResponseWriter, } } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.MultipleRequestAndResponseTypes(ctx, request.(MultipleRequestAndResponseTypesRequestObject)) } for _, middleware := range sh.middlewares { @@ -1522,7 +1522,7 @@ func (sh *strictHandler) MultipleRequestAndResponseTypes(w http.ResponseWriter, func (sh *strictHandler) NoContentHeaders(w http.ResponseWriter, r *http.Request) { var request NoContentHeadersRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.NoContentHeaders(ctx, request.(NoContentHeadersRequestObject)) } for _, middleware := range sh.middlewares { @@ -1553,7 +1553,7 @@ func (sh *strictHandler) RequiredJSONBody(w http.ResponseWriter, r *http.Request } request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.RequiredJSONBody(ctx, request.(RequiredJSONBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -1585,7 +1585,7 @@ func (sh *strictHandler) RequiredTextBody(w http.ResponseWriter, r *http.Request body := RequiredTextBodyTextRequestBody(data) request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.RequiredTextBody(ctx, request.(RequiredTextBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -1611,7 +1611,7 @@ func (sh *strictHandler) ReservedGoKeywordParameters(w http.ResponseWriter, r *h request.Type = pType - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.ReservedGoKeywordParameters(ctx, request.(ReservedGoKeywordParametersRequestObject)) } for _, middleware := range sh.middlewares { @@ -1645,7 +1645,7 @@ func (sh *strictHandler) ReusableResponses(w http.ResponseWriter, r *http.Reques request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.ReusableResponses(ctx, request.(ReusableResponsesRequestObject)) } for _, middleware := range sh.middlewares { @@ -1679,7 +1679,7 @@ func (sh *strictHandler) TextExample(w http.ResponseWriter, r *http.Request) { request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.TextExample(ctx, request.(TextExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1705,7 +1705,7 @@ func (sh *strictHandler) UnknownExample(w http.ResponseWriter, r *http.Request) request.Body = r.Body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.UnknownExample(ctx, request.(UnknownExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1733,7 +1733,7 @@ func (sh *strictHandler) UnspecifiedContentType(w http.ResponseWriter, r *http.R request.Body = r.Body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.UnspecifiedContentType(ctx, request.(UnspecifiedContentTypeRequestObject)) } for _, middleware := range sh.middlewares { @@ -1768,7 +1768,7 @@ func (sh *strictHandler) URLEncodedExample(w http.ResponseWriter, r *http.Reques } request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.URLEncodedExample(ctx, request.(URLEncodedExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1804,7 +1804,7 @@ func (sh *strictHandler) HeadersExample(w http.ResponseWriter, r *http.Request, request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.HeadersExample(ctx, request.(HeadersExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1838,7 +1838,7 @@ func (sh *strictHandler) UnionExample(w http.ResponseWriter, r *http.Request) { request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.UnionExample(ctx, request.(UnionExampleRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/strict-server/client/client.gen.go b/internal/test/strict-server/client/client.gen.go index c0e1ab08fe..30ebacaf66 100644 --- a/internal/test/strict-server/client/client.gen.go +++ b/internal/test/strict-server/client/client.gen.go @@ -889,7 +889,7 @@ func NewMultipleRequestAndResponseTypesRequestWithFormdataBody(server string, bo // NewMultipleRequestAndResponseTypesRequestWithTextBody calls the generic MultipleRequestAndResponseTypes builder with text/plain body func NewMultipleRequestAndResponseTypesRequestWithTextBody(server string, body MultipleRequestAndResponseTypesTextRequestBody) (*http.Request, error) { var bodyReader io.Reader - if stringer, ok := interface{}(body).(fmt.Stringer); ok { + if stringer, ok := any(body).(fmt.Stringer); ok { bodyReader = strings.NewReader(stringer.String()) } else { bodyReader = strings.NewReader(fmt.Sprint(body)) @@ -996,7 +996,7 @@ func NewRequiredJSONBodyRequestWithBody(server string, contentType string, body // NewRequiredTextBodyRequestWithTextBody calls the generic RequiredTextBody builder with text/plain body func NewRequiredTextBodyRequestWithTextBody(server string, body RequiredTextBodyTextRequestBody) (*http.Request, error) { var bodyReader io.Reader - if stringer, ok := interface{}(body).(fmt.Stringer); ok { + if stringer, ok := any(body).(fmt.Stringer); ok { bodyReader = strings.NewReader(stringer.String()) } else { bodyReader = strings.NewReader(fmt.Sprint(body)) @@ -1110,7 +1110,7 @@ func NewReusableResponsesRequestWithBody(server string, contentType string, body // NewTextExampleRequestWithTextBody calls the generic TextExample builder with text/plain body func NewTextExampleRequestWithTextBody(server string, body TextExampleTextRequestBody) (*http.Request, error) { var bodyReader io.Reader - if stringer, ok := interface{}(body).(fmt.Stringer); ok { + if stringer, ok := any(body).(fmt.Stringer); ok { bodyReader = strings.NewReader(stringer.String()) } else { bodyReader = strings.NewReader(fmt.Sprint(body)) diff --git a/internal/test/strict-server/echo/server.gen.go b/internal/test/strict-server/echo/server.gen.go index f3d5f6eaf9..1c65850938 100644 --- a/internal/test/strict-server/echo/server.gen.go +++ b/internal/test/strict-server/echo/server.gen.go @@ -1071,7 +1071,7 @@ func (sh *strictHandler) JSONExample(ctx echo.Context) error { request.Body = &body } - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.JSONExample(ctx.Request().Context(), request.(JSONExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1100,7 +1100,7 @@ func (sh *strictHandler) MultipartExample(ctx echo.Context) error { request.Body = reader } - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.MultipartExample(ctx.Request().Context(), request.(MultipartExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1131,7 +1131,7 @@ func (sh *strictHandler) MultipartRelatedExample(ctx echo.Context) error { request.Body = multipart.NewReader(ctx.Request().Body, boundary) } - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.MultipartRelatedExample(ctx.Request().Context(), request.(MultipartRelatedExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1196,7 +1196,7 @@ func (sh *strictHandler) MultipleRequestAndResponseTypes(ctx echo.Context) error } } - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.MultipleRequestAndResponseTypes(ctx.Request().Context(), request.(MultipleRequestAndResponseTypesRequestObject)) } for _, middleware := range sh.middlewares { @@ -1219,7 +1219,7 @@ func (sh *strictHandler) MultipleRequestAndResponseTypes(ctx echo.Context) error func (sh *strictHandler) NoContentHeaders(ctx echo.Context) error { var request NoContentHeadersRequestObject - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.NoContentHeaders(ctx.Request().Context(), request.(NoContentHeadersRequestObject)) } for _, middleware := range sh.middlewares { @@ -1248,7 +1248,7 @@ func (sh *strictHandler) RequiredJSONBody(ctx echo.Context) error { } request.Body = &body - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.RequiredJSONBody(ctx.Request().Context(), request.(RequiredJSONBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -1278,7 +1278,7 @@ func (sh *strictHandler) RequiredTextBody(ctx echo.Context) error { body := RequiredTextBodyTextRequestBody(data) request.Body = &body - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.RequiredTextBody(ctx.Request().Context(), request.(RequiredTextBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -1303,7 +1303,7 @@ func (sh *strictHandler) ReservedGoKeywordParameters(ctx echo.Context, pType str request.Type = pType - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.ReservedGoKeywordParameters(ctx.Request().Context(), request.(ReservedGoKeywordParametersRequestObject)) } for _, middleware := range sh.middlewares { @@ -1335,7 +1335,7 @@ func (sh *strictHandler) ReusableResponses(ctx echo.Context) error { request.Body = &body } - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.ReusableResponses(ctx.Request().Context(), request.(ReusableResponsesRequestObject)) } for _, middleware := range sh.middlewares { @@ -1367,7 +1367,7 @@ func (sh *strictHandler) TextExample(ctx echo.Context) error { request.Body = &body } - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.TextExample(ctx.Request().Context(), request.(TextExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1392,7 +1392,7 @@ func (sh *strictHandler) UnknownExample(ctx echo.Context) error { request.Body = ctx.Request().Body - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.UnknownExample(ctx.Request().Context(), request.(UnknownExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1419,7 +1419,7 @@ func (sh *strictHandler) UnspecifiedContentType(ctx echo.Context) error { request.Body = ctx.Request().Body - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.UnspecifiedContentType(ctx.Request().Context(), request.(UnspecifiedContentTypeRequestObject)) } for _, middleware := range sh.middlewares { @@ -1452,7 +1452,7 @@ func (sh *strictHandler) URLEncodedExample(ctx echo.Context) error { return err } - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.URLEncodedExample(ctx.Request().Context(), request.(URLEncodedExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1486,7 +1486,7 @@ func (sh *strictHandler) HeadersExample(ctx echo.Context, params HeadersExampleP request.Body = &body } - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.HeadersExample(ctx.Request().Context(), request.(HeadersExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1518,7 +1518,7 @@ func (sh *strictHandler) UnionExample(ctx echo.Context) error { request.Body = &body } - handler := func(ctx echo.Context, request interface{}) (interface{}, error) { + handler := func(ctx echo.Context, request any) (any, error) { return sh.ssi.UnionExample(ctx.Request().Context(), request.(UnionExampleRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/strict-server/fiber/server.gen.go b/internal/test/strict-server/fiber/server.gen.go index aa69ce929a..e6602c83b0 100644 --- a/internal/test/strict-server/fiber/server.gen.go +++ b/internal/test/strict-server/fiber/server.gen.go @@ -1166,7 +1166,7 @@ func (sh *strictHandler) JSONExample(ctx *fiber.Ctx) error { request.Body = &body } - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.JSONExample(ctx.UserContext(), request.(JSONExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1193,7 +1193,7 @@ func (sh *strictHandler) MultipartExample(ctx *fiber.Ctx) error { request.Body = multipart.NewReader(bytes.NewReader(ctx.Request().Body()), string(ctx.Request().Header.MultipartFormBoundary())) - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.MultipartExample(ctx.UserContext(), request.(MultipartExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1226,7 +1226,7 @@ func (sh *strictHandler) MultipartRelatedExample(ctx *fiber.Ctx) error { request.Body = multipart.NewReader(bytes.NewReader(ctx.Request().Body()), boundary) } - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.MultipartRelatedExample(ctx.UserContext(), request.(MultipartRelatedExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1283,7 +1283,7 @@ func (sh *strictHandler) MultipleRequestAndResponseTypes(ctx *fiber.Ctx) error { } } - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.MultipleRequestAndResponseTypes(ctx.UserContext(), request.(MultipleRequestAndResponseTypesRequestObject)) } for _, middleware := range sh.middlewares { @@ -1308,7 +1308,7 @@ func (sh *strictHandler) MultipleRequestAndResponseTypes(ctx *fiber.Ctx) error { func (sh *strictHandler) NoContentHeaders(ctx *fiber.Ctx) error { var request NoContentHeadersRequestObject - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.NoContentHeaders(ctx.UserContext(), request.(NoContentHeadersRequestObject)) } for _, middleware := range sh.middlewares { @@ -1339,7 +1339,7 @@ func (sh *strictHandler) RequiredJSONBody(ctx *fiber.Ctx) error { } request.Body = &body - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.RequiredJSONBody(ctx.UserContext(), request.(RequiredJSONBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -1368,7 +1368,7 @@ func (sh *strictHandler) RequiredTextBody(ctx *fiber.Ctx) error { body := RequiredTextBodyTextRequestBody(data) request.Body = &body - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.RequiredTextBody(ctx.UserContext(), request.(RequiredTextBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -1395,7 +1395,7 @@ func (sh *strictHandler) ReservedGoKeywordParameters(ctx *fiber.Ctx, pType strin request.Type = pType - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.ReservedGoKeywordParameters(ctx.UserContext(), request.(ReservedGoKeywordParametersRequestObject)) } for _, middleware := range sh.middlewares { @@ -1429,7 +1429,7 @@ func (sh *strictHandler) ReusableResponses(ctx *fiber.Ctx) error { request.Body = &body } - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.ReusableResponses(ctx.UserContext(), request.(ReusableResponsesRequestObject)) } for _, middleware := range sh.middlewares { @@ -1460,7 +1460,7 @@ func (sh *strictHandler) TextExample(ctx *fiber.Ctx) error { request.Body = &body } - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.TextExample(ctx.UserContext(), request.(TextExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1487,7 +1487,7 @@ func (sh *strictHandler) UnknownExample(ctx *fiber.Ctx) error { request.Body = bytes.NewReader(ctx.Request().Body()) - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.UnknownExample(ctx.UserContext(), request.(UnknownExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1516,7 +1516,7 @@ func (sh *strictHandler) UnspecifiedContentType(ctx *fiber.Ctx) error { request.Body = bytes.NewReader(ctx.Request().Body()) - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.UnspecifiedContentType(ctx.UserContext(), request.(UnspecifiedContentTypeRequestObject)) } for _, middleware := range sh.middlewares { @@ -1547,7 +1547,7 @@ func (sh *strictHandler) URLEncodedExample(ctx *fiber.Ctx) error { } request.Body = &body - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.URLEncodedExample(ctx.UserContext(), request.(URLEncodedExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1583,7 +1583,7 @@ func (sh *strictHandler) HeadersExample(ctx *fiber.Ctx, params HeadersExamplePar request.Body = &body } - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.HeadersExample(ctx.UserContext(), request.(HeadersExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1617,7 +1617,7 @@ func (sh *strictHandler) UnionExample(ctx *fiber.Ctx) error { request.Body = &body } - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.UnionExample(ctx.UserContext(), request.(UnionExampleRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/strict-server/gin/server.gen.go b/internal/test/strict-server/gin/server.gen.go index b5294a5b54..b7fc6b715f 100644 --- a/internal/test/strict-server/gin/server.gen.go +++ b/internal/test/strict-server/gin/server.gen.go @@ -1177,7 +1177,7 @@ func (sh *strictHandler) JSONExample(ctx *gin.Context) { request.Body = &body } - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.JSONExample(ctx, request.(JSONExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1208,7 +1208,7 @@ func (sh *strictHandler) MultipartExample(ctx *gin.Context) { request.Body = reader } - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.MultipartExample(ctx, request.(MultipartExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1242,7 +1242,7 @@ func (sh *strictHandler) MultipartRelatedExample(ctx *gin.Context) { request.Body = multipart.NewReader(ctx.Request.Body, boundary) } - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.MultipartRelatedExample(ctx, request.(MultipartRelatedExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1313,7 +1313,7 @@ func (sh *strictHandler) MultipleRequestAndResponseTypes(ctx *gin.Context) { } } - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.MultipleRequestAndResponseTypes(ctx, request.(MultipleRequestAndResponseTypesRequestObject)) } for _, middleware := range sh.middlewares { @@ -1337,7 +1337,7 @@ func (sh *strictHandler) MultipleRequestAndResponseTypes(ctx *gin.Context) { func (sh *strictHandler) NoContentHeaders(ctx *gin.Context) { var request NoContentHeadersRequestObject - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.NoContentHeaders(ctx, request.(NoContentHeadersRequestObject)) } for _, middleware := range sh.middlewares { @@ -1368,7 +1368,7 @@ func (sh *strictHandler) RequiredJSONBody(ctx *gin.Context) { } request.Body = &body - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.RequiredJSONBody(ctx, request.(RequiredJSONBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -1400,7 +1400,7 @@ func (sh *strictHandler) RequiredTextBody(ctx *gin.Context) { body := RequiredTextBodyTextRequestBody(data) request.Body = &body - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.RequiredTextBody(ctx, request.(RequiredTextBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -1426,7 +1426,7 @@ func (sh *strictHandler) ReservedGoKeywordParameters(ctx *gin.Context, pType str request.Type = pType - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.ReservedGoKeywordParameters(ctx, request.(ReservedGoKeywordParametersRequestObject)) } for _, middleware := range sh.middlewares { @@ -1460,7 +1460,7 @@ func (sh *strictHandler) ReusableResponses(ctx *gin.Context) { request.Body = &body } - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.ReusableResponses(ctx, request.(ReusableResponsesRequestObject)) } for _, middleware := range sh.middlewares { @@ -1494,7 +1494,7 @@ func (sh *strictHandler) TextExample(ctx *gin.Context) { request.Body = &body } - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.TextExample(ctx, request.(TextExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1520,7 +1520,7 @@ func (sh *strictHandler) UnknownExample(ctx *gin.Context) { request.Body = ctx.Request.Body - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.UnknownExample(ctx, request.(UnknownExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1548,7 +1548,7 @@ func (sh *strictHandler) UnspecifiedContentType(ctx *gin.Context) { request.Body = ctx.Request.Body - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.UnspecifiedContentType(ctx, request.(UnspecifiedContentTypeRequestObject)) } for _, middleware := range sh.middlewares { @@ -1583,7 +1583,7 @@ func (sh *strictHandler) URLEncodedExample(ctx *gin.Context) { } request.Body = &body - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.URLEncodedExample(ctx, request.(URLEncodedExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1619,7 +1619,7 @@ func (sh *strictHandler) HeadersExample(ctx *gin.Context, params HeadersExampleP request.Body = &body } - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.HeadersExample(ctx, request.(HeadersExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1653,7 +1653,7 @@ func (sh *strictHandler) UnionExample(ctx *gin.Context) { request.Body = &body } - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.UnionExample(ctx, request.(UnionExampleRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/strict-server/gorilla/server.gen.go b/internal/test/strict-server/gorilla/server.gen.go index e8d9dc439d..51bc4bb8c1 100644 --- a/internal/test/strict-server/gorilla/server.gen.go +++ b/internal/test/strict-server/gorilla/server.gen.go @@ -1267,7 +1267,7 @@ func (sh *strictHandler) JSONExample(w http.ResponseWriter, r *http.Request) { request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.JSONExample(ctx, request.(JSONExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1298,7 +1298,7 @@ func (sh *strictHandler) MultipartExample(w http.ResponseWriter, r *http.Request request.Body = reader } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.MultipartExample(ctx, request.(MultipartExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1332,7 +1332,7 @@ func (sh *strictHandler) MultipartRelatedExample(w http.ResponseWriter, r *http. request.Body = multipart.NewReader(r.Body, boundary) } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.MultipartRelatedExample(ctx, request.(MultipartRelatedExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1403,7 +1403,7 @@ func (sh *strictHandler) MultipleRequestAndResponseTypes(w http.ResponseWriter, } } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.MultipleRequestAndResponseTypes(ctx, request.(MultipleRequestAndResponseTypesRequestObject)) } for _, middleware := range sh.middlewares { @@ -1427,7 +1427,7 @@ func (sh *strictHandler) MultipleRequestAndResponseTypes(w http.ResponseWriter, func (sh *strictHandler) NoContentHeaders(w http.ResponseWriter, r *http.Request) { var request NoContentHeadersRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.NoContentHeaders(ctx, request.(NoContentHeadersRequestObject)) } for _, middleware := range sh.middlewares { @@ -1458,7 +1458,7 @@ func (sh *strictHandler) RequiredJSONBody(w http.ResponseWriter, r *http.Request } request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.RequiredJSONBody(ctx, request.(RequiredJSONBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -1490,7 +1490,7 @@ func (sh *strictHandler) RequiredTextBody(w http.ResponseWriter, r *http.Request body := RequiredTextBodyTextRequestBody(data) request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.RequiredTextBody(ctx, request.(RequiredTextBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -1516,7 +1516,7 @@ func (sh *strictHandler) ReservedGoKeywordParameters(w http.ResponseWriter, r *h request.Type = pType - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.ReservedGoKeywordParameters(ctx, request.(ReservedGoKeywordParametersRequestObject)) } for _, middleware := range sh.middlewares { @@ -1550,7 +1550,7 @@ func (sh *strictHandler) ReusableResponses(w http.ResponseWriter, r *http.Reques request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.ReusableResponses(ctx, request.(ReusableResponsesRequestObject)) } for _, middleware := range sh.middlewares { @@ -1584,7 +1584,7 @@ func (sh *strictHandler) TextExample(w http.ResponseWriter, r *http.Request) { request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.TextExample(ctx, request.(TextExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1610,7 +1610,7 @@ func (sh *strictHandler) UnknownExample(w http.ResponseWriter, r *http.Request) request.Body = r.Body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.UnknownExample(ctx, request.(UnknownExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1638,7 +1638,7 @@ func (sh *strictHandler) UnspecifiedContentType(w http.ResponseWriter, r *http.R request.Body = r.Body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.UnspecifiedContentType(ctx, request.(UnspecifiedContentTypeRequestObject)) } for _, middleware := range sh.middlewares { @@ -1673,7 +1673,7 @@ func (sh *strictHandler) URLEncodedExample(w http.ResponseWriter, r *http.Reques } request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.URLEncodedExample(ctx, request.(URLEncodedExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1709,7 +1709,7 @@ func (sh *strictHandler) HeadersExample(w http.ResponseWriter, r *http.Request, request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.HeadersExample(ctx, request.(HeadersExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1743,7 +1743,7 @@ func (sh *strictHandler) UnionExample(w http.ResponseWriter, r *http.Request) { request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.UnionExample(ctx, request.(UnionExampleRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/strict-server/iris/server.gen.go b/internal/test/strict-server/iris/server.gen.go index 54c401bab9..b56d3b96e4 100644 --- a/internal/test/strict-server/iris/server.gen.go +++ b/internal/test/strict-server/iris/server.gen.go @@ -989,7 +989,7 @@ func (sh *strictHandler) JSONExample(ctx iris.Context) { request.Body = &body } - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.JSONExample(ctx, request.(JSONExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1023,7 +1023,7 @@ func (sh *strictHandler) MultipartExample(ctx iris.Context) { return } - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.MultipartExample(ctx, request.(MultipartExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1060,7 +1060,7 @@ func (sh *strictHandler) MultipartRelatedExample(ctx iris.Context) { request.Body = multipart.NewReader(ctx.Request().Body, boundary) } - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.MultipartRelatedExample(ctx, request.(MultipartRelatedExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1134,7 +1134,7 @@ func (sh *strictHandler) MultipleRequestAndResponseTypes(ctx iris.Context) { } } - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.MultipleRequestAndResponseTypes(ctx, request.(MultipleRequestAndResponseTypesRequestObject)) } for _, middleware := range sh.middlewares { @@ -1161,7 +1161,7 @@ func (sh *strictHandler) MultipleRequestAndResponseTypes(ctx iris.Context) { func (sh *strictHandler) NoContentHeaders(ctx iris.Context) { var request NoContentHeadersRequestObject - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.NoContentHeaders(ctx, request.(NoContentHeadersRequestObject)) } for _, middleware := range sh.middlewares { @@ -1195,7 +1195,7 @@ func (sh *strictHandler) RequiredJSONBody(ctx iris.Context) { } request.Body = &body - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.RequiredJSONBody(ctx, request.(RequiredJSONBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -1230,7 +1230,7 @@ func (sh *strictHandler) RequiredTextBody(ctx iris.Context) { body := RequiredTextBodyTextRequestBody(data) request.Body = &body - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.RequiredTextBody(ctx, request.(RequiredTextBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -1259,7 +1259,7 @@ func (sh *strictHandler) ReservedGoKeywordParameters(ctx iris.Context, pType str request.Type = pType - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.ReservedGoKeywordParameters(ctx, request.(ReservedGoKeywordParametersRequestObject)) } for _, middleware := range sh.middlewares { @@ -1296,7 +1296,7 @@ func (sh *strictHandler) ReusableResponses(ctx iris.Context) { request.Body = &body } - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.ReusableResponses(ctx, request.(ReusableResponsesRequestObject)) } for _, middleware := range sh.middlewares { @@ -1333,7 +1333,7 @@ func (sh *strictHandler) TextExample(ctx iris.Context) { request.Body = &body } - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.TextExample(ctx, request.(TextExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1362,7 +1362,7 @@ func (sh *strictHandler) UnknownExample(ctx iris.Context) { request.Body = ctx.Request().Body - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.UnknownExample(ctx, request.(UnknownExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1393,7 +1393,7 @@ func (sh *strictHandler) UnspecifiedContentType(ctx iris.Context) { request.Body = ctx.Request().Body - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.UnspecifiedContentType(ctx, request.(UnspecifiedContentTypeRequestObject)) } for _, middleware := range sh.middlewares { @@ -1431,7 +1431,7 @@ func (sh *strictHandler) URLEncodedExample(ctx iris.Context) { } request.Body = &body - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.URLEncodedExample(ctx, request.(URLEncodedExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1470,7 +1470,7 @@ func (sh *strictHandler) HeadersExample(ctx iris.Context, params HeadersExampleP request.Body = &body } - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.HeadersExample(ctx, request.(HeadersExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1507,7 +1507,7 @@ func (sh *strictHandler) UnionExample(ctx iris.Context) { request.Body = &body } - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.UnionExample(ctx, request.(UnionExampleRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/internal/test/strict-server/stdhttp/server.gen.go b/internal/test/strict-server/stdhttp/server.gen.go index f3073a462b..232f91586b 100644 --- a/internal/test/strict-server/stdhttp/server.gen.go +++ b/internal/test/strict-server/stdhttp/server.gen.go @@ -1261,7 +1261,7 @@ func (sh *strictHandler) JSONExample(w http.ResponseWriter, r *http.Request) { request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.JSONExample(ctx, request.(JSONExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1292,7 +1292,7 @@ func (sh *strictHandler) MultipartExample(w http.ResponseWriter, r *http.Request request.Body = reader } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.MultipartExample(ctx, request.(MultipartExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1326,7 +1326,7 @@ func (sh *strictHandler) MultipartRelatedExample(w http.ResponseWriter, r *http. request.Body = multipart.NewReader(r.Body, boundary) } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.MultipartRelatedExample(ctx, request.(MultipartRelatedExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1397,7 +1397,7 @@ func (sh *strictHandler) MultipleRequestAndResponseTypes(w http.ResponseWriter, } } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.MultipleRequestAndResponseTypes(ctx, request.(MultipleRequestAndResponseTypesRequestObject)) } for _, middleware := range sh.middlewares { @@ -1421,7 +1421,7 @@ func (sh *strictHandler) MultipleRequestAndResponseTypes(w http.ResponseWriter, func (sh *strictHandler) NoContentHeaders(w http.ResponseWriter, r *http.Request) { var request NoContentHeadersRequestObject - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.NoContentHeaders(ctx, request.(NoContentHeadersRequestObject)) } for _, middleware := range sh.middlewares { @@ -1452,7 +1452,7 @@ func (sh *strictHandler) RequiredJSONBody(w http.ResponseWriter, r *http.Request } request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.RequiredJSONBody(ctx, request.(RequiredJSONBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -1484,7 +1484,7 @@ func (sh *strictHandler) RequiredTextBody(w http.ResponseWriter, r *http.Request body := RequiredTextBodyTextRequestBody(data) request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.RequiredTextBody(ctx, request.(RequiredTextBodyRequestObject)) } for _, middleware := range sh.middlewares { @@ -1510,7 +1510,7 @@ func (sh *strictHandler) ReservedGoKeywordParameters(w http.ResponseWriter, r *h request.Type = pType - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.ReservedGoKeywordParameters(ctx, request.(ReservedGoKeywordParametersRequestObject)) } for _, middleware := range sh.middlewares { @@ -1544,7 +1544,7 @@ func (sh *strictHandler) ReusableResponses(w http.ResponseWriter, r *http.Reques request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.ReusableResponses(ctx, request.(ReusableResponsesRequestObject)) } for _, middleware := range sh.middlewares { @@ -1578,7 +1578,7 @@ func (sh *strictHandler) TextExample(w http.ResponseWriter, r *http.Request) { request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.TextExample(ctx, request.(TextExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1604,7 +1604,7 @@ func (sh *strictHandler) UnknownExample(w http.ResponseWriter, r *http.Request) request.Body = r.Body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.UnknownExample(ctx, request.(UnknownExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1632,7 +1632,7 @@ func (sh *strictHandler) UnspecifiedContentType(w http.ResponseWriter, r *http.R request.Body = r.Body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.UnspecifiedContentType(ctx, request.(UnspecifiedContentTypeRequestObject)) } for _, middleware := range sh.middlewares { @@ -1667,7 +1667,7 @@ func (sh *strictHandler) URLEncodedExample(w http.ResponseWriter, r *http.Reques } request.Body = &body - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.URLEncodedExample(ctx, request.(URLEncodedExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1703,7 +1703,7 @@ func (sh *strictHandler) HeadersExample(w http.ResponseWriter, r *http.Request, request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.HeadersExample(ctx, request.(HeadersExampleRequestObject)) } for _, middleware := range sh.middlewares { @@ -1737,7 +1737,7 @@ func (sh *strictHandler) UnionExample(w http.ResponseWriter, r *http.Request) { request.Body = &body } - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.UnionExample(ctx, request.(UnionExampleRequestObject)) } for _, middleware := range sh.middlewares { diff --git a/pkg/codegen/codegen_test.go b/pkg/codegen/codegen_test.go index 600aaf308d..0ee71361a5 100644 --- a/pkg/codegen/codegen_test.go +++ b/pkg/codegen/codegen_test.go @@ -65,9 +65,9 @@ type GetTestByNameResponse struct { // XML200 the response for an HTTP 200 `+"`application/xml`"+` response XML200 *[]Test // JSON422 the response for an HTTP 422 `+"`application/json`"+` response - JSON422 *[]interface{} + JSON422 *[]any // XML422 the response for an HTTP 422 `+"`application/xml`"+` response - XML422 *[]interface{} + XML422 *[]any // JSONDefault the response for an HTTP default `+"`application/json`"+` response JSONDefault *Error }`) diff --git a/pkg/codegen/schema.go b/pkg/codegen/schema.go index 0081fa41a4..c7f1948a12 100644 --- a/pkg/codegen/schema.go +++ b/pkg/codegen/schema.go @@ -589,7 +589,7 @@ func GenerateGoSchema(sref *openapi3.SchemaRef, path []string) (Schema, error) { // i.e. the parent schema defines a type:array, but the array has // no items defined. Therefore, we have at least valid Go-Code. if sref == nil { - return Schema{GoType: "interface{}"}, nil + return Schema{GoType: "any"}, nil } schema := sref.Value @@ -774,13 +774,13 @@ func GenerateGoSchema(sref *openapi3.SchemaRef, path []string) (Schema, error) { if t.Is("object") { // We have an object with no properties. This is a generic object // expressed as a map. - outType = "map[string]interface{}" + outType = "map[string]any" setSkipOptionalPointerForContainerType(&outSchema) } else { // t == "" // If we don't even have the object designator, we're a completely // generic type. - outType = "interface{}" - // this should never have an "optional pointer", as it doesn't make sense to be a `*interface{}` + outType = "any" + // this should never have an "optional pointer", as it doesn't make sense to be a `*any` outSchema.SkipOptionalPointer = true } outSchema.GoType = outType @@ -797,7 +797,7 @@ func GenerateGoSchema(sref *openapi3.SchemaRef, path []string) (Schema, error) { // Until we have a concrete additional properties type, we default to // any schema. outSchema.AdditionalPropertiesType = &Schema{ - GoType: "interface{}", + GoType: "any", } // If additional properties are defined, we will override the default diff --git a/pkg/codegen/template_helpers.go b/pkg/codegen/template_helpers.go index f19a79dd39..1cbde9c62d 100644 --- a/pkg/codegen/template_helpers.go +++ b/pkg/codegen/template_helpers.go @@ -156,8 +156,8 @@ func genResponseUnmarshal(op *OperationDefinition) string { for _, contentTypeName := range SortedMapKeys { - // We get "interface{}" when using "anyOf" or "oneOf" (which doesn't work with Go types): - if typeDefinition.TypeName == "interface{}" { + // We get "any" when using "anyOf" or "oneOf" (which doesn't work with Go types): + if typeDefinition.TypeName == "any" { // Unable to unmarshal this, so we leave it out: continue } diff --git a/pkg/codegen/templates/callback-initiator.tmpl b/pkg/codegen/templates/callback-initiator.tmpl index 908695bf37..8689dae976 100644 --- a/pkg/codegen/templates/callback-initiator.tmpl +++ b/pkg/codegen/templates/callback-initiator.tmpl @@ -138,7 +138,7 @@ func New{{$opid}}CallbackRequest{{.Suffix}}(targetURL string{{if $hasParams}}, p } bodyReader = strings.NewReader(bodyStr.Encode()) {{else if eq .NameTag "Text" -}} - if stringer, ok := interface{}(body).(fmt.Stringer); ok { + if stringer, ok := any(body).(fmt.Stringer); ok { bodyReader = strings.NewReader(stringer.String()) } else { {{if .Schema.IsPrimitive -}} diff --git a/pkg/codegen/templates/client.tmpl b/pkg/codegen/templates/client.tmpl index 55f298a4cb..2426a1f1e7 100644 --- a/pkg/codegen/templates/client.tmpl +++ b/pkg/codegen/templates/client.tmpl @@ -177,7 +177,7 @@ func New{{$opid}}Request{{.Suffix}}(server string{{genParamArgs $pathParams}}{{i } bodyReader = strings.NewReader(bodyStr.Encode()) {{else if eq .NameTag "Text" -}} - if stringer, ok := interface{}(body).(fmt.Stringer); ok { + if stringer, ok := any(body).(fmt.Stringer); ok { bodyReader = strings.NewReader(stringer.String()) } else { {{if .Schema.IsPrimitive -}} diff --git a/pkg/codegen/templates/strict/strict-echo.tmpl b/pkg/codegen/templates/strict/strict-echo.tmpl index 0683c15e30..f0d0ab0cf5 100644 --- a/pkg/codegen/templates/strict/strict-echo.tmpl +++ b/pkg/codegen/templates/strict/strict-echo.tmpl @@ -90,7 +90,7 @@ type strictHandler struct { {{if $multipleBodies}}}{{end}} {{end}}{{/* range .Bodies */}} - handler := func(ctx echo.Context, request interface{}) (interface{}, error){ + handler := func(ctx echo.Context, request any) (any, error){ return sh.ssi.{{.OperationId}}(ctx.Request().Context(), request.({{$opid | ucFirst}}RequestObject)) } for _, middleware := range sh.middlewares { diff --git a/pkg/codegen/templates/strict/strict-echo5.tmpl b/pkg/codegen/templates/strict/strict-echo5.tmpl index 687dd57a8b..c040fba7ce 100644 --- a/pkg/codegen/templates/strict/strict-echo5.tmpl +++ b/pkg/codegen/templates/strict/strict-echo5.tmpl @@ -77,7 +77,7 @@ type strictHandler struct { {{if $multipleBodies}}}{{end}} {{end}}{{/* range .Bodies */}} - handler := func(ctx *echo.Context, request interface{}) (interface{}, error){ + handler := func(ctx *echo.Context, request any) (any, error){ return sh.ssi.{{.OperationId}}(ctx.Request().Context(), request.({{$opid | ucFirst}}RequestObject)) } for _, middleware := range sh.middlewares { diff --git a/pkg/codegen/templates/strict/strict-fiber.tmpl b/pkg/codegen/templates/strict/strict-fiber.tmpl index 0bdc9af82d..6f9b04ae18 100644 --- a/pkg/codegen/templates/strict/strict-fiber.tmpl +++ b/pkg/codegen/templates/strict/strict-fiber.tmpl @@ -80,7 +80,7 @@ type strictHandler struct { {{if $multipleBodies}}}{{end}} {{end}}{{/* range .Bodies */}} - handler := func(ctx *fiber.Ctx, request interface{}) (interface{}, error) { + handler := func(ctx *fiber.Ctx, request any) (any, error) { return sh.ssi.{{.OperationId}}(ctx.UserContext(), request.({{$opid | ucFirst}}RequestObject)) } for _, middleware := range sh.middlewares { diff --git a/pkg/codegen/templates/strict/strict-gin.tmpl b/pkg/codegen/templates/strict/strict-gin.tmpl index ed2e561a51..3ab0cd976b 100644 --- a/pkg/codegen/templates/strict/strict-gin.tmpl +++ b/pkg/codegen/templates/strict/strict-gin.tmpl @@ -142,7 +142,7 @@ type strictHandler struct { {{if $multipleBodies}}}{{end}} {{end}}{{/* range .Bodies */}} - handler := func(ctx *gin.Context, request interface{}) (interface{}, error) { + handler := func(ctx *gin.Context, request any) (any, error) { return sh.ssi.{{.OperationId}}(ctx, request.({{$opid | ucFirst}}RequestObject)) } for _, middleware := range sh.middlewares { diff --git a/pkg/codegen/templates/strict/strict-http.tmpl b/pkg/codegen/templates/strict/strict-http.tmpl index 062e5459e4..3d09382ea2 100644 --- a/pkg/codegen/templates/strict/strict-http.tmpl +++ b/pkg/codegen/templates/strict/strict-http.tmpl @@ -114,7 +114,7 @@ type strictHandler struct { {{if $multipleBodies}}}{{end}} {{end}}{{/* range .Bodies */}} - handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request interface{}) (interface{}, error) { + handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, request any) (any, error) { return sh.ssi.{{.OperationId}}(ctx, request.({{$opid | ucFirst}}RequestObject)) } for _, middleware := range sh.middlewares { diff --git a/pkg/codegen/templates/strict/strict-iris.tmpl b/pkg/codegen/templates/strict/strict-iris.tmpl index 5195c251b0..3a864309cb 100644 --- a/pkg/codegen/templates/strict/strict-iris.tmpl +++ b/pkg/codegen/templates/strict/strict-iris.tmpl @@ -97,7 +97,7 @@ type strictHandler struct { {{if $multipleBodies}}}{{end}} {{end}}{{/* range .Bodies */}} - handler := func(ctx iris.Context, request interface{}) (interface{}, error) { + handler := func(ctx iris.Context, request any) (any, error) { return sh.ssi.{{.OperationId}}(ctx, request.({{$opid | ucFirst}}RequestObject)) } for _, middleware := range sh.middlewares { diff --git a/pkg/codegen/templates/union.tmpl b/pkg/codegen/templates/union.tmpl index 61c2bf37fd..d8044e3c8e 100644 --- a/pkg/codegen/templates/union.tmpl +++ b/pkg/codegen/templates/union.tmpl @@ -74,7 +74,7 @@ } {{if ne 0 (len $discriminator.Mapping)}} - func (t {{.TypeName}}) ValueByDiscriminator() (interface{}, error) { + func (t {{.TypeName}}) ValueByDiscriminator() (any, error) { discriminator, err := t.Discriminator() if err != nil { return nil, err diff --git a/pkg/codegen/templates/webhook-initiator.tmpl b/pkg/codegen/templates/webhook-initiator.tmpl index 032e3933ed..29e32afef7 100644 --- a/pkg/codegen/templates/webhook-initiator.tmpl +++ b/pkg/codegen/templates/webhook-initiator.tmpl @@ -137,7 +137,7 @@ func New{{$opid}}WebhookRequest{{.Suffix}}(targetURL string{{if $hasParams}}, pa } bodyReader = strings.NewReader(bodyStr.Encode()) {{else if eq .NameTag "Text" -}} - if stringer, ok := interface{}(body).(fmt.Stringer); ok { + if stringer, ok := any(body).(fmt.Stringer); ok { bodyReader = strings.NewReader(stringer.String()) } else { {{if .Schema.IsPrimitive -}}