diff --git a/examples/internal/clients/abe/api_a_bit_of_everything_service.go b/examples/internal/clients/abe/api_a_bit_of_everything_service.go index bceea6a..f3ed0b9 100644 --- a/examples/internal/clients/abe/api_a_bit_of_everything_service.go +++ b/examples/internal/clients/abe/api_a_bit_of_everything_service.go @@ -12,12 +12,12 @@ package abe import ( "context" + "fmt" + "github.com/antihax/optional" "io/ioutil" "net/http" "net/url" "strings" - "fmt" - "github.com/antihax/optional" ) // Linger please @@ -27,20 +27,20 @@ var ( type ABitOfEverythingServiceApiService service -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param value + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param value @return interface{} */ -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckExternalNestedPathEnum(ctx context.Context, value string) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckExternalNestedPathEnum(ctx context.Context, value string) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -78,7 +78,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckExternal key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -99,104 +99,104 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckExternal if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param value + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param value @return interface{} */ -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckExternalPathEnum(ctx context.Context, value string) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckExternalPathEnum(ctx context.Context, value string) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -234,7 +234,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckExternal key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -255,91 +255,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckExternal if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param singleNestedName name is nested field. @@ -351,83 +351,83 @@ ABitOfEverythingServiceApiService * @param requiredStringField1 * @param requiredStringField2 * @param optional nil or *ABitOfEverythingServiceCheckGetQueryParamsOpts - Optional Parameters: - * @param "SingleNestedAmount" (optional.Int64) - + * @param "SingleNestedAmount" (optional.Int64) - * @param "SingleNestedOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "StringValue" (optional.String) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - + * @param "Uint64Value" (optional.String) - + * @param "Int32Value" (optional.Int32) - + * @param "Fixed64Value" (optional.String) - + * @param "Fixed32Value" (optional.Int64) - + * @param "BoolValue" (optional.Bool) - + * @param "StringValue" (optional.String) - + * @param "BytesValue" (optional.String) - + * @param "Uint32Value" (optional.Int64) - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofString" (optional.String) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - + * @param "PathEnumValue" (optional.String) - + * @param "NestedPathEnumValue" (optional.String) - + * @param "Sfixed32Value" (optional.Int32) - + * @param "Sfixed64Value" (optional.String) - + * @param "Sint32Value" (optional.Int32) - + * @param "Sint64Value" (optional.String) - + * @param "RepeatedStringValue" (optional.Interface of []string) - + * @param "OneofString" (optional.String) - + * @param "NonConventionalNameValue" (optional.String) - + * @param "TimestampValue" (optional.Time) - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. - * @param "NestedAnnotationAmount" (optional.Int64) - + * @param "NestedAnnotationAmount" (optional.Int64) - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - + * @param "Int64OverrideType" (optional.Int64) - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - + * @param "OptionalStringValue" (optional.String) - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce @return ExamplepbABitOfEverything */ -type ABitOfEverythingServiceCheckGetQueryParamsOpts struct { - SingleNestedAmount optional.Int64 - SingleNestedOk optional.String - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - StringValue optional.String - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofString optional.String - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 +type ABitOfEverythingServiceCheckGetQueryParamsOpts struct { + SingleNestedAmount optional.Int64 + SingleNestedOk optional.String + Uint64Value optional.String + Int32Value optional.Int32 + Fixed64Value optional.String + Fixed32Value optional.Int64 + BoolValue optional.Bool + StringValue optional.String + BytesValue optional.String + Uint32Value optional.Int64 + EnumValue optional.String + PathEnumValue optional.String + NestedPathEnumValue optional.String + Sfixed32Value optional.Int32 + Sfixed64Value optional.String + Sint32Value optional.Int32 + Sint64Value optional.String + RepeatedStringValue optional.Interface + OneofString optional.String + NonConventionalNameValue optional.String + TimestampValue optional.Time + RepeatedEnumValue optional.Interface + RepeatedEnumAnnotation optional.Interface + EnumValueAnnotation optional.String + RepeatedStringAnnotation optional.Interface + NestedAnnotationAmount optional.Int64 + NestedAnnotationOk optional.String + Int64OverrideType optional.Int64 OutputOnlyStringViaFieldBehaviorAnnotation optional.String - OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String + OptionalStringValue optional.String + ProductId optional.Interface + OptionalStringField optional.String } func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckGetQueryParams(ctx context.Context, singleNestedName string, uuid string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, localVarOptionals *ABitOfEverythingServiceCheckGetQueryParamsOpts) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -569,7 +569,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckGetQuery key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -590,91 +590,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckGetQuery if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param singleNestedOk DeepEnum description. @@ -687,82 +687,82 @@ ABitOfEverythingServiceApiService * @param requiredStringField2 * @param optional nil or *ABitOfEverythingServiceCheckNestedEnumGetQueryParamsOpts - Optional Parameters: * @param "SingleNestedName" (optional.String) - name is nested field. - * @param "SingleNestedAmount" (optional.Int64) - - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "StringValue" (optional.String) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - + * @param "SingleNestedAmount" (optional.Int64) - + * @param "Uint64Value" (optional.String) - + * @param "Int32Value" (optional.Int32) - + * @param "Fixed64Value" (optional.String) - + * @param "Fixed32Value" (optional.Int64) - + * @param "BoolValue" (optional.Bool) - + * @param "StringValue" (optional.String) - + * @param "BytesValue" (optional.String) - + * @param "Uint32Value" (optional.Int64) - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofString" (optional.String) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - + * @param "PathEnumValue" (optional.String) - + * @param "NestedPathEnumValue" (optional.String) - + * @param "Sfixed32Value" (optional.Int32) - + * @param "Sfixed64Value" (optional.String) - + * @param "Sint32Value" (optional.Int32) - + * @param "Sint64Value" (optional.String) - + * @param "RepeatedStringValue" (optional.Interface of []string) - + * @param "OneofString" (optional.String) - + * @param "NonConventionalNameValue" (optional.String) - + * @param "TimestampValue" (optional.Time) - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - - * @param "Int64OverrideType" (optional.Int64) - + * @param "NestedAnnotationAmount" (optional.Int64) - + * @param "Int64OverrideType" (optional.Int64) - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - + * @param "OptionalStringValue" (optional.String) - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce @return ExamplepbABitOfEverything */ -type ABitOfEverythingServiceCheckNestedEnumGetQueryParamsOpts struct { - SingleNestedName optional.String - SingleNestedAmount optional.Int64 - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - StringValue optional.String - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofString optional.String - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - Int64OverrideType optional.Int64 +type ABitOfEverythingServiceCheckNestedEnumGetQueryParamsOpts struct { + SingleNestedName optional.String + SingleNestedAmount optional.Int64 + Uint64Value optional.String + Int32Value optional.Int32 + Fixed64Value optional.String + Fixed32Value optional.Int64 + BoolValue optional.Bool + StringValue optional.String + BytesValue optional.String + Uint32Value optional.Int64 + EnumValue optional.String + PathEnumValue optional.String + NestedPathEnumValue optional.String + Sfixed32Value optional.Int32 + Sfixed64Value optional.String + Sint32Value optional.Int32 + Sint64Value optional.String + RepeatedStringValue optional.Interface + OneofString optional.String + NonConventionalNameValue optional.String + TimestampValue optional.Time + RepeatedEnumValue optional.Interface + RepeatedEnumAnnotation optional.Interface + EnumValueAnnotation optional.String + RepeatedStringAnnotation optional.Interface + NestedAnnotationName optional.String + NestedAnnotationAmount optional.Int64 + Int64OverrideType optional.Int64 OutputOnlyStringViaFieldBehaviorAnnotation optional.String - OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String + OptionalStringValue optional.String + ProductId optional.Interface + OptionalStringField optional.String } func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckNestedEnumGetQueryParams(ctx context.Context, singleNestedOk string, uuid string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, localVarOptionals *ABitOfEverythingServiceCheckNestedEnumGetQueryParamsOpts) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -904,7 +904,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckNestedEn key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -925,91 +925,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckNestedEn if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param stringValue @@ -1022,79 +1022,79 @@ ABitOfEverythingServiceApiService * @param requiredStringField1 * @param requiredStringField2 * @param optional nil or *ABitOfEverythingServiceCheckPostQueryParamsOpts - Optional Parameters: - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - + * @param "Uint64Value" (optional.String) - + * @param "Int32Value" (optional.Int32) - + * @param "Fixed64Value" (optional.String) - + * @param "Fixed32Value" (optional.Int64) - + * @param "BoolValue" (optional.Bool) - + * @param "BytesValue" (optional.String) - + * @param "Uint32Value" (optional.Int64) - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofString" (optional.String) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - + * @param "PathEnumValue" (optional.String) - + * @param "NestedPathEnumValue" (optional.String) - + * @param "Sfixed32Value" (optional.Int32) - + * @param "Sfixed64Value" (optional.String) - + * @param "Sint32Value" (optional.Int32) - + * @param "Sint64Value" (optional.String) - + * @param "RepeatedStringValue" (optional.Interface of []string) - + * @param "OneofString" (optional.String) - + * @param "NonConventionalNameValue" (optional.String) - + * @param "TimestampValue" (optional.Time) - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - + * @param "NestedAnnotationAmount" (optional.Int64) - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - + * @param "Int64OverrideType" (optional.Int64) - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - + * @param "OptionalStringValue" (optional.String) - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce @return ExamplepbABitOfEverything */ -type ABitOfEverythingServiceCheckPostQueryParamsOpts struct { - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofString optional.String - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 +type ABitOfEverythingServiceCheckPostQueryParamsOpts struct { + Uint64Value optional.String + Int32Value optional.Int32 + Fixed64Value optional.String + Fixed32Value optional.Int64 + BoolValue optional.Bool + BytesValue optional.String + Uint32Value optional.Int64 + EnumValue optional.String + PathEnumValue optional.String + NestedPathEnumValue optional.String + Sfixed32Value optional.Int32 + Sfixed64Value optional.String + Sint32Value optional.Int32 + Sint64Value optional.String + RepeatedStringValue optional.Interface + OneofString optional.String + NonConventionalNameValue optional.String + TimestampValue optional.Time + RepeatedEnumValue optional.Interface + RepeatedEnumAnnotation optional.Interface + EnumValueAnnotation optional.String + RepeatedStringAnnotation optional.Interface + NestedAnnotationName optional.String + NestedAnnotationAmount optional.Int64 + NestedAnnotationOk optional.String + Int64OverrideType optional.Int64 OutputOnlyStringViaFieldBehaviorAnnotation optional.String - OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String + OptionalStringValue optional.String + ProductId optional.Interface + OptionalStringField optional.String } func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckPostQueryParams(ctx context.Context, stringValue string, singleNested ABitOfEverythingNested, uuid string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, localVarOptionals *ABitOfEverythingServiceCheckPostQueryParamsOpts) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -1232,7 +1232,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckPostQuer key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -1253,102 +1253,102 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckPostQuer if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @return ExamplepbCheckStatusResponse */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckStatus(ctx context.Context) (ExamplepbCheckStatusResponse, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbCheckStatusResponse ) @@ -1386,7 +1386,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckStatus(c key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -1407,91 +1407,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCheckStatus(c if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbCheckStatusResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService Create a new ABitOfEverything This API creates a new ABitOfEverything * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @@ -1520,54 +1520,54 @@ This API creates a new ABitOfEverything * @param requiredStringField2 * @param optional nil or *ABitOfEverythingServiceCreateOpts - Optional Parameters: * @param "SingleNestedName" (optional.String) - name is nested field. - * @param "SingleNestedAmount" (optional.Int64) - + * @param "SingleNestedAmount" (optional.Int64) - * @param "SingleNestedOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "BytesValue" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofString" (optional.String) - - * @param "TimestampValue" (optional.Time) - + * @param "BytesValue" (optional.String) - + * @param "RepeatedStringValue" (optional.Interface of []string) - + * @param "OneofString" (optional.String) - + * @param "TimestampValue" (optional.Time) - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - + * @param "NestedAnnotationAmount" (optional.Int64) - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - + * @param "Int64OverrideType" (optional.Int64) - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - + * @param "OptionalStringValue" (optional.String) - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce @return ExamplepbABitOfEverything */ -type ABitOfEverythingServiceCreateOpts struct { - SingleNestedName optional.String - SingleNestedAmount optional.Int64 - SingleNestedOk optional.String - BytesValue optional.String - RepeatedStringValue optional.Interface - OneofString optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 +type ABitOfEverythingServiceCreateOpts struct { + SingleNestedName optional.String + SingleNestedAmount optional.Int64 + SingleNestedOk optional.String + BytesValue optional.String + RepeatedStringValue optional.Interface + OneofString optional.String + TimestampValue optional.Time + RepeatedEnumValue optional.Interface + RepeatedEnumAnnotation optional.Interface + RepeatedStringAnnotation optional.Interface + NestedAnnotationName optional.String + NestedAnnotationAmount optional.Int64 + NestedAnnotationOk optional.String + Int64OverrideType optional.Int64 OutputOnlyStringViaFieldBehaviorAnnotation optional.String - OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String + OptionalStringValue optional.String + ProductId optional.Interface + OptionalStringField optional.String } func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreate(ctx context.Context, floatValue float32, doubleValue float64, int64Value string, uint64Value string, int32Value int32, fixed64Value string, fixed32Value int64, boolValue bool, stringValue string, uint32Value int64, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, nonConventionalNameValue string, enumValue string, pathEnumValue string, nestedPathEnumValue string, enumValueAnnotation string, uuid string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, localVarOptionals *ABitOfEverythingServiceCreateOpts) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -1682,7 +1682,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreate(ctx co key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -1703,103 +1703,103 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreate(ctx co if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param body Intentionally complicated message type to cover many features of Protobuf. + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param body Intentionally complicated message type to cover many features of Protobuf. @return ExamplepbABitOfEverything */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreateBody(ctx context.Context, body ExamplepbABitOfEverything) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -1839,7 +1839,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreateBody(ct key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -1860,91 +1860,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreateBody(ct if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService Create a book. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param parent The publisher in which to create the book. Format: `publishers/{publisher}` Example: `publishers/1257894000000000000` @@ -1955,16 +1955,16 @@ ABitOfEverythingServiceApiService Create a book. @return ExamplepbBook */ -type ABitOfEverythingServiceCreateBookOpts struct { +type ABitOfEverythingServiceCreateBookOpts struct { BookId optional.String } func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreateBook(ctx context.Context, parent string, book ExamplepbBook, localVarOptionals *ABitOfEverythingServiceCreateBookOpts) (ExamplepbBook, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbBook ) @@ -2008,7 +2008,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreateBook(ct key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -2029,91 +2029,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCreateBook(ct if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbBook - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param uuidName @@ -2125,86 +2125,86 @@ ABitOfEverythingServiceApiService * @param requiredStringField2 * @param optional nil or *ABitOfEverythingServiceCustomOpts - Optional Parameters: * @param "SingleNestedName" (optional.String) - name is nested field. - * @param "SingleNestedAmount" (optional.Int64) - + * @param "SingleNestedAmount" (optional.Int64) - * @param "SingleNestedOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "StringValue" (optional.String) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - + * @param "Uint64Value" (optional.String) - + * @param "Int32Value" (optional.Int32) - + * @param "Fixed64Value" (optional.String) - + * @param "Fixed32Value" (optional.Int64) - + * @param "BoolValue" (optional.Bool) - + * @param "StringValue" (optional.String) - + * @param "BytesValue" (optional.String) - + * @param "Uint32Value" (optional.Int64) - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofString" (optional.String) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - + * @param "PathEnumValue" (optional.String) - + * @param "NestedPathEnumValue" (optional.String) - + * @param "Sfixed32Value" (optional.Int32) - + * @param "Sfixed64Value" (optional.String) - + * @param "Sint32Value" (optional.Int32) - + * @param "Sint64Value" (optional.String) - + * @param "RepeatedStringValue" (optional.Interface of []string) - + * @param "OneofString" (optional.String) - + * @param "NonConventionalNameValue" (optional.String) - + * @param "TimestampValue" (optional.Time) - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - + * @param "NestedAnnotationAmount" (optional.Int64) - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - + * @param "Int64OverrideType" (optional.Int64) - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - + * @param "OptionalStringValue" (optional.String) - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce @return ExamplepbABitOfEverything */ -type ABitOfEverythingServiceCustomOpts struct { - SingleNestedName optional.String - SingleNestedAmount optional.Int64 - SingleNestedOk optional.String - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - StringValue optional.String - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofString optional.String - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 +type ABitOfEverythingServiceCustomOpts struct { + SingleNestedName optional.String + SingleNestedAmount optional.Int64 + SingleNestedOk optional.String + Uint64Value optional.String + Int32Value optional.Int32 + Fixed64Value optional.String + Fixed32Value optional.Int64 + BoolValue optional.Bool + StringValue optional.String + BytesValue optional.String + Uint32Value optional.Int64 + EnumValue optional.String + PathEnumValue optional.String + NestedPathEnumValue optional.String + Sfixed32Value optional.Int32 + Sfixed64Value optional.String + Sint32Value optional.Int32 + Sint64Value optional.String + RepeatedStringValue optional.Interface + OneofString optional.String + NonConventionalNameValue optional.String + TimestampValue optional.Time + RepeatedEnumValue optional.Interface + RepeatedEnumAnnotation optional.Interface + EnumValueAnnotation optional.String + RepeatedStringAnnotation optional.Interface + NestedAnnotationName optional.String + NestedAnnotationAmount optional.Int64 + NestedAnnotationOk optional.String + Int64OverrideType optional.Int64 OutputOnlyStringViaFieldBehaviorAnnotation optional.String - OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String + OptionalStringValue optional.String + ProductId optional.Interface + OptionalStringField optional.String } func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustom(ctx context.Context, uuidName string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, localVarOptionals *ABitOfEverythingServiceCustomOpts) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -2351,7 +2351,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustom(ctx co key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -2372,91 +2372,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustom(ctx co if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param uuidName @@ -2468,87 +2468,87 @@ ABitOfEverythingServiceApiService * @param requiredStringField2 * @param optional nil or *ABitOfEverythingServiceCustomOptionsRequestOpts - Optional Parameters: * @param "SingleNestedName" (optional.String) - name is nested field. - * @param "SingleNestedAmount" (optional.Int64) - + * @param "SingleNestedAmount" (optional.Int64) - * @param "SingleNestedOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "StringValue" (optional.String) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - + * @param "Uint64Value" (optional.String) - + * @param "Int32Value" (optional.Int32) - + * @param "Fixed64Value" (optional.String) - + * @param "Fixed32Value" (optional.Int64) - + * @param "BoolValue" (optional.Bool) - + * @param "StringValue" (optional.String) - + * @param "BytesValue" (optional.String) - + * @param "Uint32Value" (optional.Int64) - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofString" (optional.String) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - + * @param "PathEnumValue" (optional.String) - + * @param "NestedPathEnumValue" (optional.String) - + * @param "Sfixed32Value" (optional.Int32) - + * @param "Sfixed64Value" (optional.String) - + * @param "Sint32Value" (optional.Int32) - + * @param "Sint64Value" (optional.String) - + * @param "RepeatedStringValue" (optional.Interface of []string) - + * @param "OneofString" (optional.String) - + * @param "NonConventionalNameValue" (optional.String) - + * @param "TimestampValue" (optional.Time) - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - + * @param "NestedAnnotationAmount" (optional.Int64) - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - + * @param "Int64OverrideType" (optional.Int64) - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - + * @param "OptionalStringValue" (optional.String) - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce @return interface{} */ -type ABitOfEverythingServiceCustomOptionsRequestOpts struct { - SingleNestedName optional.String - SingleNestedAmount optional.Int64 - SingleNestedOk optional.String - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - StringValue optional.String - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofString optional.String - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 +type ABitOfEverythingServiceCustomOptionsRequestOpts struct { + SingleNestedName optional.String + SingleNestedAmount optional.Int64 + SingleNestedOk optional.String + Uint64Value optional.String + Int32Value optional.Int32 + Fixed64Value optional.String + Fixed32Value optional.Int64 + BoolValue optional.Bool + StringValue optional.String + BytesValue optional.String + Uint32Value optional.Int64 + EnumValue optional.String + PathEnumValue optional.String + NestedPathEnumValue optional.String + Sfixed32Value optional.Int32 + Sfixed64Value optional.String + Sint32Value optional.Int32 + Sint64Value optional.String + RepeatedStringValue optional.Interface + OneofString optional.String + NonConventionalNameValue optional.String + TimestampValue optional.Time + RepeatedEnumValue optional.Interface + RepeatedEnumAnnotation optional.Interface + EnumValueAnnotation optional.String + RepeatedStringAnnotation optional.Interface + NestedAnnotationName optional.String + NestedAnnotationAmount optional.Int64 + NestedAnnotationOk optional.String + Int64OverrideType optional.Int64 OutputOnlyStringViaFieldBehaviorAnnotation optional.String - OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String + OptionalStringValue optional.String + ProductId optional.Interface + OptionalStringField optional.String } -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustomOptionsRequest(ctx context.Context, uuidName string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, localVarOptionals *ABitOfEverythingServiceCustomOptionsRequestOpts) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustomOptionsRequest(ctx context.Context, uuidName string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, localVarOptionals *ABitOfEverythingServiceCustomOptionsRequestOpts) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Options") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Options") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -2694,7 +2694,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustomOptions key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -2715,60 +2715,60 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceCustomOptions if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param singleNestedName name is nested field. - * @param body + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param singleNestedName name is nested field. + - @param body @return ExamplepbABitOfEverything */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDeepPathEcho(ctx context.Context, singleNestedName string, body ABitOfEverything1) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -2809,7 +2809,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDeepPathEcho( key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -2830,104 +2830,104 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDeepPathEcho( if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param uuid + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param uuid @return interface{} */ -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDelete(ctx context.Context, uuid string) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDelete(ctx context.Context, uuid string) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Delete") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Delete") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -2965,7 +2965,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDelete(ctx co key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -2986,91 +2986,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDelete(ctx co if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param uuidName @@ -3082,86 +3082,86 @@ ABitOfEverythingServiceApiService * @param requiredStringField2 * @param optional nil or *ABitOfEverythingServiceDoubleColonOpts - Optional Parameters: * @param "SingleNestedName" (optional.String) - name is nested field. - * @param "SingleNestedAmount" (optional.Int64) - + * @param "SingleNestedAmount" (optional.Int64) - * @param "SingleNestedOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "StringValue" (optional.String) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - + * @param "Uint64Value" (optional.String) - + * @param "Int32Value" (optional.Int32) - + * @param "Fixed64Value" (optional.String) - + * @param "Fixed32Value" (optional.Int64) - + * @param "BoolValue" (optional.Bool) - + * @param "StringValue" (optional.String) - + * @param "BytesValue" (optional.String) - + * @param "Uint32Value" (optional.Int64) - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofString" (optional.String) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - + * @param "PathEnumValue" (optional.String) - + * @param "NestedPathEnumValue" (optional.String) - + * @param "Sfixed32Value" (optional.Int32) - + * @param "Sfixed64Value" (optional.String) - + * @param "Sint32Value" (optional.Int32) - + * @param "Sint64Value" (optional.String) - + * @param "RepeatedStringValue" (optional.Interface of []string) - + * @param "OneofString" (optional.String) - + * @param "NonConventionalNameValue" (optional.String) - + * @param "TimestampValue" (optional.Time) - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - + * @param "NestedAnnotationAmount" (optional.Int64) - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - + * @param "Int64OverrideType" (optional.Int64) - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - + * @param "OptionalStringValue" (optional.String) - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce @return ExamplepbABitOfEverything */ -type ABitOfEverythingServiceDoubleColonOpts struct { - SingleNestedName optional.String - SingleNestedAmount optional.Int64 - SingleNestedOk optional.String - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - StringValue optional.String - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofString optional.String - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 +type ABitOfEverythingServiceDoubleColonOpts struct { + SingleNestedName optional.String + SingleNestedAmount optional.Int64 + SingleNestedOk optional.String + Uint64Value optional.String + Int32Value optional.Int32 + Fixed64Value optional.String + Fixed32Value optional.Int64 + BoolValue optional.Bool + StringValue optional.String + BytesValue optional.String + Uint32Value optional.Int64 + EnumValue optional.String + PathEnumValue optional.String + NestedPathEnumValue optional.String + Sfixed32Value optional.Int32 + Sfixed64Value optional.String + Sint32Value optional.Int32 + Sint64Value optional.String + RepeatedStringValue optional.Interface + OneofString optional.String + NonConventionalNameValue optional.String + TimestampValue optional.Time + RepeatedEnumValue optional.Interface + RepeatedEnumAnnotation optional.Interface + EnumValueAnnotation optional.String + RepeatedStringAnnotation optional.Interface + NestedAnnotationName optional.String + NestedAnnotationAmount optional.Int64 + NestedAnnotationOk optional.String + Int64OverrideType optional.Int64 OutputOnlyStringViaFieldBehaviorAnnotation optional.String - OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String + OptionalStringValue optional.String + ProductId optional.Interface + OptionalStringField optional.String } func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDoubleColon(ctx context.Context, uuidName string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, localVarOptionals *ABitOfEverythingServiceDoubleColonOpts) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -3308,7 +3308,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDoubleColon(c key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -3329,103 +3329,103 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDoubleColon(c if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @return interface{} */ -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceErrorWithDetails(ctx context.Context) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceErrorWithDetails(ctx context.Context) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -3462,7 +3462,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceErrorWithDeta key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -3483,91 +3483,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceErrorWithDeta if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param uuidName @@ -3579,87 +3579,87 @@ ABitOfEverythingServiceApiService * @param requiredStringField2 * @param optional nil or *ABitOfEverythingServiceExistsOpts - Optional Parameters: * @param "SingleNestedName" (optional.String) - name is nested field. - * @param "SingleNestedAmount" (optional.Int64) - + * @param "SingleNestedAmount" (optional.Int64) - * @param "SingleNestedOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "StringValue" (optional.String) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - + * @param "Uint64Value" (optional.String) - + * @param "Int32Value" (optional.Int32) - + * @param "Fixed64Value" (optional.String) - + * @param "Fixed32Value" (optional.Int64) - + * @param "BoolValue" (optional.Bool) - + * @param "StringValue" (optional.String) - + * @param "BytesValue" (optional.String) - + * @param "Uint32Value" (optional.Int64) - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofString" (optional.String) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - + * @param "PathEnumValue" (optional.String) - + * @param "NestedPathEnumValue" (optional.String) - + * @param "Sfixed32Value" (optional.Int32) - + * @param "Sfixed64Value" (optional.String) - + * @param "Sint32Value" (optional.Int32) - + * @param "Sint64Value" (optional.String) - + * @param "RepeatedStringValue" (optional.Interface of []string) - + * @param "OneofString" (optional.String) - + * @param "NonConventionalNameValue" (optional.String) - + * @param "TimestampValue" (optional.Time) - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - + * @param "NestedAnnotationAmount" (optional.Int64) - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - + * @param "Int64OverrideType" (optional.Int64) - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - + * @param "OptionalStringValue" (optional.String) - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce @return interface{} */ -type ABitOfEverythingServiceExistsOpts struct { - SingleNestedName optional.String - SingleNestedAmount optional.Int64 - SingleNestedOk optional.String - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - StringValue optional.String - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofString optional.String - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 +type ABitOfEverythingServiceExistsOpts struct { + SingleNestedName optional.String + SingleNestedAmount optional.Int64 + SingleNestedOk optional.String + Uint64Value optional.String + Int32Value optional.Int32 + Fixed64Value optional.String + Fixed32Value optional.Int64 + BoolValue optional.Bool + StringValue optional.String + BytesValue optional.String + Uint32Value optional.Int64 + EnumValue optional.String + PathEnumValue optional.String + NestedPathEnumValue optional.String + Sfixed32Value optional.Int32 + Sfixed64Value optional.String + Sint32Value optional.Int32 + Sint64Value optional.String + RepeatedStringValue optional.Interface + OneofString optional.String + NonConventionalNameValue optional.String + TimestampValue optional.Time + RepeatedEnumValue optional.Interface + RepeatedEnumAnnotation optional.Interface + EnumValueAnnotation optional.String + RepeatedStringAnnotation optional.Interface + NestedAnnotationName optional.String + NestedAnnotationAmount optional.Int64 + NestedAnnotationOk optional.String + Int64OverrideType optional.Int64 OutputOnlyStringViaFieldBehaviorAnnotation optional.String - OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String + OptionalStringValue optional.String + ProductId optional.Interface + OptionalStringField optional.String } -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceExists(ctx context.Context, uuidName string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, localVarOptionals *ABitOfEverythingServiceExistsOpts) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceExists(ctx context.Context, uuidName string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, localVarOptionals *ABitOfEverythingServiceExistsOpts) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Head") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Head") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -3805,7 +3805,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceExists(ctx co key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -3826,61 +3826,61 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceExists(ctx co if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param id - * @param data + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param id + - @param data @return interface{} */ -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetMessageWithBody(ctx context.Context, id string, data ExamplepbBody) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetMessageWithBody(ctx context.Context, id string, data ExamplepbBody) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -3920,7 +3920,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetMessageWit key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -3941,91 +3941,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetMessageWit if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param uuidName @@ -4037,87 +4037,87 @@ ABitOfEverythingServiceApiService * @param requiredStringField2 * @param optional nil or *ABitOfEverythingServiceGetQueryOpts - Optional Parameters: * @param "SingleNestedName" (optional.String) - name is nested field. - * @param "SingleNestedAmount" (optional.Int64) - + * @param "SingleNestedAmount" (optional.Int64) - * @param "SingleNestedOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Uint64Value" (optional.String) - - * @param "Int32Value" (optional.Int32) - - * @param "Fixed64Value" (optional.String) - - * @param "Fixed32Value" (optional.Int64) - - * @param "BoolValue" (optional.Bool) - - * @param "StringValue" (optional.String) - - * @param "BytesValue" (optional.String) - - * @param "Uint32Value" (optional.Int64) - + * @param "Uint64Value" (optional.String) - + * @param "Int32Value" (optional.Int32) - + * @param "Fixed64Value" (optional.String) - + * @param "Fixed32Value" (optional.Int64) - + * @param "BoolValue" (optional.Bool) - + * @param "StringValue" (optional.String) - + * @param "BytesValue" (optional.String) - + * @param "Uint32Value" (optional.Int64) - * @param "EnumValue" (optional.String) - - ZERO: ZERO means 0 - ONE: ONE means 1 - * @param "PathEnumValue" (optional.String) - - * @param "NestedPathEnumValue" (optional.String) - - * @param "Sfixed32Value" (optional.Int32) - - * @param "Sfixed64Value" (optional.String) - - * @param "Sint32Value" (optional.Int32) - - * @param "Sint64Value" (optional.String) - - * @param "RepeatedStringValue" (optional.Interface of []string) - - * @param "OneofString" (optional.String) - - * @param "NonConventionalNameValue" (optional.String) - - * @param "TimestampValue" (optional.Time) - + * @param "PathEnumValue" (optional.String) - + * @param "NestedPathEnumValue" (optional.String) - + * @param "Sfixed32Value" (optional.Int32) - + * @param "Sfixed64Value" (optional.String) - + * @param "Sint32Value" (optional.Int32) - + * @param "Sint64Value" (optional.String) - + * @param "RepeatedStringValue" (optional.Interface of []string) - + * @param "OneofString" (optional.String) - + * @param "NonConventionalNameValue" (optional.String) - + * @param "TimestampValue" (optional.Time) - * @param "RepeatedEnumValue" (optional.Interface of []string) - repeated enum value. it is comma-separated in query - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedEnumAnnotation" (optional.Interface of []string) - Repeated numeric enum title Repeated numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "EnumValueAnnotation" (optional.String) - Numeric enum title Numeric enum description. - ZERO: ZERO means 0 - ONE: ONE means 1 * @param "RepeatedStringAnnotation" (optional.Interface of []string) - Repeated string title Repeated string description. * @param "NestedAnnotationName" (optional.String) - name is nested field. - * @param "NestedAnnotationAmount" (optional.Int64) - + * @param "NestedAnnotationAmount" (optional.Int64) - * @param "NestedAnnotationOk" (optional.String) - DeepEnum description. - FALSE: FALSE is false. - TRUE: TRUE is true. - * @param "Int64OverrideType" (optional.Int64) - + * @param "Int64OverrideType" (optional.Int64) - * @param "OutputOnlyStringViaFieldBehaviorAnnotation" (optional.String) - mark a field as readonly in Open API definition - * @param "OptionalStringValue" (optional.String) - + * @param "OptionalStringValue" (optional.String) - * @param "ProductId" (optional.Interface of []string) - Test openapiv2 generation of repeated fields Only digits are allowed. * @param "OptionalStringField" (optional.String) - Test openapiv2 generation of required fields with annotation and jsonschema to reproduce @return interface{} */ -type ABitOfEverythingServiceGetQueryOpts struct { - SingleNestedName optional.String - SingleNestedAmount optional.Int64 - SingleNestedOk optional.String - Uint64Value optional.String - Int32Value optional.Int32 - Fixed64Value optional.String - Fixed32Value optional.Int64 - BoolValue optional.Bool - StringValue optional.String - BytesValue optional.String - Uint32Value optional.Int64 - EnumValue optional.String - PathEnumValue optional.String - NestedPathEnumValue optional.String - Sfixed32Value optional.Int32 - Sfixed64Value optional.String - Sint32Value optional.Int32 - Sint64Value optional.String - RepeatedStringValue optional.Interface - OneofString optional.String - NonConventionalNameValue optional.String - TimestampValue optional.Time - RepeatedEnumValue optional.Interface - RepeatedEnumAnnotation optional.Interface - EnumValueAnnotation optional.String - RepeatedStringAnnotation optional.Interface - NestedAnnotationName optional.String - NestedAnnotationAmount optional.Int64 - NestedAnnotationOk optional.String - Int64OverrideType optional.Int64 +type ABitOfEverythingServiceGetQueryOpts struct { + SingleNestedName optional.String + SingleNestedAmount optional.Int64 + SingleNestedOk optional.String + Uint64Value optional.String + Int32Value optional.Int32 + Fixed64Value optional.String + Fixed32Value optional.Int64 + BoolValue optional.Bool + StringValue optional.String + BytesValue optional.String + Uint32Value optional.Int64 + EnumValue optional.String + PathEnumValue optional.String + NestedPathEnumValue optional.String + Sfixed32Value optional.Int32 + Sfixed64Value optional.String + Sint32Value optional.Int32 + Sint64Value optional.String + RepeatedStringValue optional.Interface + OneofString optional.String + NonConventionalNameValue optional.String + TimestampValue optional.Time + RepeatedEnumValue optional.Interface + RepeatedEnumAnnotation optional.Interface + EnumValueAnnotation optional.String + RepeatedStringAnnotation optional.Interface + NestedAnnotationName optional.String + NestedAnnotationAmount optional.Int64 + NestedAnnotationOk optional.String + Int64OverrideType optional.Int64 OutputOnlyStringViaFieldBehaviorAnnotation optional.String - OptionalStringValue optional.String - ProductId optional.Interface - OptionalStringField optional.String + OptionalStringValue optional.String + ProductId optional.Interface + OptionalStringField optional.String } -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetQuery(ctx context.Context, uuidName string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, localVarOptionals *ABitOfEverythingServiceGetQueryOpts) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetQuery(ctx context.Context, uuidName string, floatValue float32, doubleValue float64, int64Value string, requiredStringViaFieldBehaviorAnnotation string, requiredStringField1 string, requiredStringField2 string, localVarOptionals *ABitOfEverythingServiceGetQueryOpts) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -4271,118 +4271,118 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetQuery(ctx if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param pathRepeatedFloatValue repeated values. they are comma-separated in path - * @param pathRepeatedDoubleValue - * @param pathRepeatedInt64Value - * @param pathRepeatedUint64Value - * @param pathRepeatedInt32Value - * @param pathRepeatedFixed64Value - * @param pathRepeatedFixed32Value - * @param pathRepeatedBoolValue - * @param pathRepeatedStringValue - * @param pathRepeatedBytesValue - * @param pathRepeatedUint32Value - * @param pathRepeatedEnumValue - * @param pathRepeatedSfixed32Value - * @param pathRepeatedSfixed64Value - * @param pathRepeatedSint32Value - * @param pathRepeatedSint64Value + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param pathRepeatedFloatValue repeated values. they are comma-separated in path + - @param pathRepeatedDoubleValue + - @param pathRepeatedInt64Value + - @param pathRepeatedUint64Value + - @param pathRepeatedInt32Value + - @param pathRepeatedFixed64Value + - @param pathRepeatedFixed32Value + - @param pathRepeatedBoolValue + - @param pathRepeatedStringValue + - @param pathRepeatedBytesValue + - @param pathRepeatedUint32Value + - @param pathRepeatedEnumValue + - @param pathRepeatedSfixed32Value + - @param pathRepeatedSfixed64Value + - @param pathRepeatedSint32Value + - @param pathRepeatedSint64Value @return ExamplepbABitOfEverythingRepeated */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetRepeatedQuery(ctx context.Context, pathRepeatedFloatValue []float32, pathRepeatedDoubleValue []float64, pathRepeatedInt64Value []string, pathRepeatedUint64Value []string, pathRepeatedInt32Value []int32, pathRepeatedFixed64Value []string, pathRepeatedFixed32Value []int64, pathRepeatedBoolValue []bool, pathRepeatedStringValue []string, pathRepeatedBytesValue []string, pathRepeatedUint32Value []int64, pathRepeatedEnumValue []string, pathRepeatedSfixed32Value []int32, pathRepeatedSfixed64Value []string, pathRepeatedSint32Value []int32, pathRepeatedSint64Value []string) (ExamplepbABitOfEverythingRepeated, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverythingRepeated ) @@ -4484,7 +4484,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetRepeatedQu key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -4505,103 +4505,103 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceGetRepeatedQu if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverythingRepeated - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param uuid + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param uuid @return ExamplepbABitOfEverything */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceLookup(ctx context.Context, uuid string) (ExamplepbABitOfEverything, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbABitOfEverything ) @@ -4640,7 +4640,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceLookup(ctx co key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -4661,102 +4661,102 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceLookup(ctx co if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbABitOfEverything - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @return string */ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceOverwriteResponseContentType(ctx context.Context) (string, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue string ) @@ -4794,7 +4794,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceOverwriteResp key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -4815,104 +4815,104 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceOverwriteResp if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param exampleEnum + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param exampleEnum @return interface{} */ -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostOneofEnum(ctx context.Context, exampleEnum OneofenumExampleEnum) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostOneofEnum(ctx context.Context, exampleEnum OneofenumExampleEnum) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -4951,7 +4951,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostOneofEnum key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -4972,105 +4972,105 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostOneofEnum if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param name - * @param body + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param name + - @param body @return interface{} */ -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostWithEmptyBody(ctx context.Context, name string, body interface{}) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostWithEmptyBody(ctx context.Context, name string, body any) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -5110,7 +5110,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostWithEmpty key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -5131,103 +5131,103 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServicePostWithEmpty if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @return interface{} */ -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceTimeout(ctx context.Context) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceTimeout(ctx context.Context) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -5264,7 +5264,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceTimeout(ctx c key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -5285,105 +5285,105 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceTimeout(ctx c if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param uuidName - * @param body + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param uuidName + - @param body @return interface{} */ -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdate(ctx context.Context, uuidName string, body ABitOfEverything) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdate(ctx context.Context, uuidName string, body ABitOfEverything) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Put") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Put") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -5423,7 +5423,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdate(ctx co key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -5444,91 +5444,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdate(ctx co if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param bookName The resource name of the book. Format: `publishers/{publisher}/books/{book}` Example: `publishers/1257894000000000000/books/my-book` @@ -5540,17 +5540,17 @@ ABitOfEverythingServiceApiService @return ExamplepbBook */ -type ABitOfEverythingServiceUpdateBookOpts struct { - UpdateMask optional.String +type ABitOfEverythingServiceUpdateBookOpts struct { + UpdateMask optional.String AllowMissing optional.Bool } func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateBook(ctx context.Context, bookName string, book TheBookToUpdate_, localVarOptionals *ABitOfEverythingServiceUpdateBookOpts) (ExamplepbBook, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Patch") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Patch") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbBook ) @@ -5597,7 +5597,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateBook(ct key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -5618,91 +5618,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateBook(ct if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbBook - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param uuidName @@ -5713,17 +5713,17 @@ ABitOfEverythingServiceApiService @return interface{} */ -type ABitOfEverythingServiceUpdateV2Opts struct { +type ABitOfEverythingServiceUpdateV2Opts struct { UpdateMask optional.String } -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV2(ctx context.Context, uuidName string, abe ABitOfEverything2, localVarOptionals *ABitOfEverythingServiceUpdateV2Opts) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV2(ctx context.Context, uuidName string, abe ABitOfEverything2, localVarOptionals *ABitOfEverythingServiceUpdateV2Opts) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Put") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Put") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -5766,7 +5766,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV2(ctx key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -5787,91 +5787,91 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV2(ctx if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param uuidName @@ -5882,17 +5882,17 @@ ABitOfEverythingServiceApiService @return interface{} */ -type ABitOfEverythingServiceUpdateV22Opts struct { +type ABitOfEverythingServiceUpdateV22Opts struct { UpdateMask optional.String } -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV22(ctx context.Context, uuidName string, abe ABitOfEverything3, localVarOptionals *ABitOfEverythingServiceUpdateV22Opts) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV22(ctx context.Context, uuidName string, abe ABitOfEverything3, localVarOptionals *ABitOfEverythingServiceUpdateV22Opts) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Patch") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Patch") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -5935,7 +5935,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV22(ctx key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -5956,105 +5956,105 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV22(ctx if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ABitOfEverythingServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param uuidName - * @param body + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param uuidName + - @param body @return interface{} */ -func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV23(ctx context.Context, uuidName string, body UpdateV2RequestRequestForUpdateIncludesTheMessageAndTheUpdateMask) (interface{}, *http.Response, error) { +func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV23(ctx context.Context, uuidName string, body UpdateV2RequestRequestForUpdateIncludesTheMessageAndTheUpdateMask) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Patch") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Patch") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -6094,7 +6094,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV23(ctx key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -6115,84 +6115,84 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceUpdateV23(ctx if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } diff --git a/examples/internal/clients/abe/api_camel_case_service_name.go b/examples/internal/clients/abe/api_camel_case_service_name.go index ea4269f..500822f 100644 --- a/examples/internal/clients/abe/api_camel_case_service_name.go +++ b/examples/internal/clients/abe/api_camel_case_service_name.go @@ -25,19 +25,19 @@ var ( type CamelCaseServiceNameApiService service -/* +/* CamelCaseServiceNameApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @return interface{} */ -func (a *CamelCaseServiceNameApiService) CamelCaseServiceNameEmpty(ctx context.Context) (interface{}, *http.Response, error) { +func (a *CamelCaseServiceNameApiService) CamelCaseServiceNameEmpty(ctx context.Context) (any, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte - localVarReturnValue interface{} + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte + localVarReturnValue any ) // create path and map variables @@ -74,7 +74,7 @@ func (a *CamelCaseServiceNameApiService) CamelCaseServiceNameEmpty(ctx context.C key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -95,84 +95,84 @@ func (a *CamelCaseServiceNameApiService) CamelCaseServiceNameEmpty(ctx context.C if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } diff --git a/examples/internal/clients/abe/api_echo_rpc.go b/examples/internal/clients/abe/api_echo_rpc.go index 1578fbf..c6689c0 100644 --- a/examples/internal/clients/abe/api_echo_rpc.go +++ b/examples/internal/clients/abe/api_echo_rpc.go @@ -12,12 +12,12 @@ package abe import ( "context" + "fmt" + "github.com/antihax/optional" "io/ioutil" "net/http" "net/url" "strings" - "fmt" - "github.com/antihax/optional" ) // Linger please @@ -27,20 +27,20 @@ var ( type EchoRpcApiService service -/* +/* EchoRpcApiService Summary: Echo rpc Description Echo - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param value + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param value @return SubStringMessage */ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho(ctx context.Context, value string) (SubStringMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue SubStringMessage ) @@ -79,7 +79,7 @@ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho(ctx context.Context, val key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -100,115 +100,115 @@ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho(ctx context.Context, val if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v SubStringMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v int32 - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 503 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoRpcApiService Summary: Echo rpc Description Echo - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param value + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param value @return SubStringMessage */ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho2(ctx context.Context, value string) (SubStringMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue SubStringMessage ) @@ -248,7 +248,7 @@ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho2(ctx context.Context, va key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -269,121 +269,121 @@ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho2(ctx context.Context, va if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v SubStringMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v int32 - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 503 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoRpcApiService Summary: Echo rpc Description Echo * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *ABitOfEverythingServiceEcho3Opts - Optional Parameters: - * @param "Value" (optional.String) - + * @param "Value" (optional.String) - @return SubStringMessage */ -type ABitOfEverythingServiceEcho3Opts struct { +type ABitOfEverythingServiceEcho3Opts struct { Value optional.String } func (a *EchoRpcApiService) ABitOfEverythingServiceEcho3(ctx context.Context, localVarOptionals *ABitOfEverythingServiceEcho3Opts) (SubStringMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue SubStringMessage ) @@ -424,7 +424,7 @@ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho3(ctx context.Context, lo key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -445,95 +445,95 @@ func (a *EchoRpcApiService) ABitOfEverythingServiceEcho3(ctx context.Context, lo if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v SubStringMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v int32 - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 503 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } diff --git a/examples/internal/clients/abe/api_snake_enum_service.go b/examples/internal/clients/abe/api_snake_enum_service.go index 0c28d4a..9c36349 100644 --- a/examples/internal/clients/abe/api_snake_enum_service.go +++ b/examples/internal/clients/abe/api_snake_enum_service.go @@ -12,11 +12,11 @@ package abe import ( "context" + "fmt" "io/ioutil" "net/http" "net/url" "strings" - "fmt" ) // Linger please @@ -26,21 +26,21 @@ var ( type SnakeEnumServiceApiService service -/* +/* SnakeEnumServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param who - * @param what - * @param where + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param who + - @param what + - @param where @return ExamplepbSnakeEnumResponse */ func (a *SnakeEnumServiceApiService) SnakeEnumServiceSnakeEnum(ctx context.Context, who string, what string, where string) (ExamplepbSnakeEnumResponse, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSnakeEnumResponse ) @@ -81,7 +81,7 @@ func (a *SnakeEnumServiceApiService) SnakeEnumServiceSnakeEnum(ctx context.Conte key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -102,84 +102,84 @@ func (a *SnakeEnumServiceApiService) SnakeEnumServiceSnakeEnum(ctx context.Conte if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSnakeEnumResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 418 { var v ExamplepbNumericEnum - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 500 { var v ExamplepbErrorResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } diff --git a/examples/internal/clients/abe/client.go b/examples/internal/clients/abe/client.go index 8552ff0..ac34085 100644 --- a/examples/internal/clients/abe/client.go +++ b/examples/internal/clients/abe/client.go @@ -118,7 +118,7 @@ func contains(haystack []string, needle string) bool { } // Verify optional parameters are of the correct type. -func typeCheckParameter(obj interface{}, expected string, name string) error { +func typeCheckParameter(obj any, expected string, name string) error { // Make sure there is an object. if obj == nil { return nil @@ -132,7 +132,7 @@ func typeCheckParameter(obj interface{}, expected string, name string) error { } // parameterToString convert interface{} parameters to string, using a delimiter if format is provided. -func parameterToString(obj interface{}, collectionFormat string) string { +func parameterToString(obj any, collectionFormat string) string { var delimiter string switch collectionFormat { @@ -167,7 +167,7 @@ func (c *APIClient) ChangeBasePath(path string) { func (c *APIClient) prepareRequest( ctx context.Context, path string, method string, - postBody interface{}, + postBody any, headerParams map[string]string, queryParams url.Values, formParams url.Values, @@ -309,18 +309,18 @@ func (c *APIClient) prepareRequest( return localVarRequest, nil } -func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err error) { - if strings.Contains(contentType, "application/xml") { - if err = xml.Unmarshal(b, v); err != nil { - return err - } - return nil - } else if strings.Contains(contentType, "application/json") { - if err = json.Unmarshal(b, v); err != nil { - return err - } - return nil +func (c *APIClient) decode(v any, b []byte, contentType string) (err error) { + if strings.Contains(contentType, "application/xml") { + if err = xml.Unmarshal(b, v); err != nil { + return err + } + return nil + } else if strings.Contains(contentType, "application/json") { + if err = json.Unmarshal(b, v); err != nil { + return err } + return nil + } return errors.New("undefined response type") } @@ -342,12 +342,12 @@ func addFile(w *multipart.Writer, fieldName, path string) error { } // Prevent trying to import "fmt" -func reportError(format string, a ...interface{}) error { +func reportError(format string, a ...any) error { return fmt.Errorf(format, a...) } // Set request body from an interface{} -func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) { +func setBody(body any, contentType string) (bodyBuf *bytes.Buffer, err error) { if bodyBuf == nil { bodyBuf = &bytes.Buffer{} } @@ -378,7 +378,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e } // detectContentType method is used to figure out `Request.Body` content type for request header -func detectContentType(body interface{}) string { +func detectContentType(body any) string { contentType := "text/plain; charset=utf-8" kind := reflect.TypeOf(body).Kind() @@ -455,7 +455,7 @@ func strlen(s string) int { type GenericSwaggerError struct { body []byte error string - model interface{} + model any } // Error returns non-empty string if there was an error. @@ -469,6 +469,6 @@ func (e GenericSwaggerError) Body() []byte { } // Model returns the unpacked model of the error -func (e GenericSwaggerError) Model() interface{} { +func (e GenericSwaggerError) Model() any { return e.model -} \ No newline at end of file +} diff --git a/examples/internal/clients/abe/model_a_bit_of_everything.go b/examples/internal/clients/abe/model_a_bit_of_everything.go index 3fcd1ed..a97fa8e 100644 --- a/examples/internal/clients/abe/model_a_bit_of_everything.go +++ b/examples/internal/clients/abe/model_a_bit_of_everything.go @@ -16,36 +16,36 @@ import ( // Intentionally complicated message type to cover many features of Protobuf. type ABitOfEverything struct { - SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` + Nested []ABitOfEverythingNested `json:"nested,omitempty"` // Float value field - FloatValue float32 `json:"floatValue"` - DoubleValue float64 `json:"doubleValue"` - Int64Value string `json:"int64Value"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + FloatValue float32 `json:"floatValue"` + DoubleValue float64 `json:"doubleValue"` + Int64Value string `json:"int64Value"` + Uint64Value string `json:"uint64Value,omitempty"` + Int32Value int32 `json:"int32Value,omitempty"` + Fixed64Value string `json:"fixed64Value,omitempty"` + Fixed32Value int64 `json:"fixed32Value,omitempty"` + BoolValue bool `json:"boolValue,omitempty"` + StringValue string `json:"stringValue,omitempty"` + BytesValue string `json:"bytesValue,omitempty"` + Uint32Value int64 `json:"uint32Value,omitempty"` + EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` + Sfixed32Value int32 `json:"sfixed32Value,omitempty"` + Sfixed64Value string `json:"sfixed64Value,omitempty"` + Sint32Value int32 `json:"sint32Value,omitempty"` + Sint64Value string `json:"sint64Value,omitempty"` + RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` + OneofEmpty *any `json:"oneofEmpty,omitempty"` + OneofString string `json:"oneofString,omitempty"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` + NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` + TimestampValue time.Time `json:"timestampValue,omitempty"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` // Repeated numeric enum description. RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` // Numeric enum description. @@ -55,14 +55,14 @@ type ABitOfEverything struct { // Repeated nested object description. RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` // Nested object description. - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` + Int64OverrideType int64 `json:"int64OverrideType,omitempty"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` // Only digits are allowed. - ProductId []string `json:"productId,omitempty"` - OptionalStringField string `json:"optionalStringField,omitempty"` - RequiredStringField1 string `json:"requiredStringField1"` - RequiredStringField2 string `json:"requiredStringField2"` + ProductId []string `json:"productId,omitempty"` + OptionalStringField string `json:"optionalStringField,omitempty"` + RequiredStringField1 string `json:"requiredStringField1"` + RequiredStringField2 string `json:"requiredStringField2"` } diff --git a/examples/internal/clients/abe/model_a_bit_of_everything_1.go b/examples/internal/clients/abe/model_a_bit_of_everything_1.go index c0f60f5..05d6dab 100644 --- a/examples/internal/clients/abe/model_a_bit_of_everything_1.go +++ b/examples/internal/clients/abe/model_a_bit_of_everything_1.go @@ -17,36 +17,36 @@ import ( // Intentionally complicated message type to cover many features of Protobuf. type ABitOfEverything1 struct { SingleNested *V1exampledeepPathsingleNestedNameSingleNested `json:"singleNested,omitempty"` - Uuid string `json:"uuid"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + Uuid string `json:"uuid"` + Nested []ABitOfEverythingNested `json:"nested,omitempty"` // Float value field - FloatValue float32 `json:"floatValue"` - DoubleValue float64 `json:"doubleValue"` - Int64Value string `json:"int64Value"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + FloatValue float32 `json:"floatValue"` + DoubleValue float64 `json:"doubleValue"` + Int64Value string `json:"int64Value"` + Uint64Value string `json:"uint64Value,omitempty"` + Int32Value int32 `json:"int32Value,omitempty"` + Fixed64Value string `json:"fixed64Value,omitempty"` + Fixed32Value int64 `json:"fixed32Value,omitempty"` + BoolValue bool `json:"boolValue,omitempty"` + StringValue string `json:"stringValue,omitempty"` + BytesValue string `json:"bytesValue,omitempty"` + Uint32Value int64 `json:"uint32Value,omitempty"` + EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` + Sfixed32Value int32 `json:"sfixed32Value,omitempty"` + Sfixed64Value string `json:"sfixed64Value,omitempty"` + Sint32Value int32 `json:"sint32Value,omitempty"` + Sint64Value string `json:"sint64Value,omitempty"` + RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` + OneofEmpty *any `json:"oneofEmpty,omitempty"` + OneofString string `json:"oneofString,omitempty"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` + NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` + TimestampValue time.Time `json:"timestampValue,omitempty"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` // Repeated numeric enum description. RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` // Numeric enum description. @@ -56,14 +56,14 @@ type ABitOfEverything1 struct { // Repeated nested object description. RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` // Nested object description. - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` + Int64OverrideType int64 `json:"int64OverrideType,omitempty"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` // Only digits are allowed. - ProductId []string `json:"productId,omitempty"` - OptionalStringField string `json:"optionalStringField,omitempty"` - RequiredStringField1 string `json:"requiredStringField1"` - RequiredStringField2 string `json:"requiredStringField2"` + ProductId []string `json:"productId,omitempty"` + OptionalStringField string `json:"optionalStringField,omitempty"` + RequiredStringField1 string `json:"requiredStringField1"` + RequiredStringField2 string `json:"requiredStringField2"` } diff --git a/examples/internal/clients/abe/model_a_bit_of_everything_2.go b/examples/internal/clients/abe/model_a_bit_of_everything_2.go index dd8fab2..7906732 100644 --- a/examples/internal/clients/abe/model_a_bit_of_everything_2.go +++ b/examples/internal/clients/abe/model_a_bit_of_everything_2.go @@ -16,36 +16,36 @@ import ( // Intentionally complicated message type to cover many features of Protobuf. type ABitOfEverything2 struct { - SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` + Nested []ABitOfEverythingNested `json:"nested,omitempty"` // Float value field - FloatValue float32 `json:"floatValue"` - DoubleValue float64 `json:"doubleValue"` - Int64Value string `json:"int64Value"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + FloatValue float32 `json:"floatValue"` + DoubleValue float64 `json:"doubleValue"` + Int64Value string `json:"int64Value"` + Uint64Value string `json:"uint64Value,omitempty"` + Int32Value int32 `json:"int32Value,omitempty"` + Fixed64Value string `json:"fixed64Value,omitempty"` + Fixed32Value int64 `json:"fixed32Value,omitempty"` + BoolValue bool `json:"boolValue,omitempty"` + StringValue string `json:"stringValue,omitempty"` + BytesValue string `json:"bytesValue,omitempty"` + Uint32Value int64 `json:"uint32Value,omitempty"` + EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` + Sfixed32Value int32 `json:"sfixed32Value,omitempty"` + Sfixed64Value string `json:"sfixed64Value,omitempty"` + Sint32Value int32 `json:"sint32Value,omitempty"` + Sint64Value string `json:"sint64Value,omitempty"` + RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` + OneofEmpty *any `json:"oneofEmpty,omitempty"` + OneofString string `json:"oneofString,omitempty"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` + NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` + TimestampValue time.Time `json:"timestampValue,omitempty"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` // Repeated numeric enum description. RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` // Numeric enum description. @@ -55,14 +55,14 @@ type ABitOfEverything2 struct { // Repeated nested object description. RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` // Nested object description. - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` + Int64OverrideType int64 `json:"int64OverrideType,omitempty"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` // Only digits are allowed. - ProductId []string `json:"productId,omitempty"` - OptionalStringField string `json:"optionalStringField,omitempty"` - RequiredStringField1 string `json:"requiredStringField1"` - RequiredStringField2 string `json:"requiredStringField2"` + ProductId []string `json:"productId,omitempty"` + OptionalStringField string `json:"optionalStringField,omitempty"` + RequiredStringField1 string `json:"requiredStringField1"` + RequiredStringField2 string `json:"requiredStringField2"` } diff --git a/examples/internal/clients/abe/model_a_bit_of_everything_3.go b/examples/internal/clients/abe/model_a_bit_of_everything_3.go index 385b00a..dde10f6 100644 --- a/examples/internal/clients/abe/model_a_bit_of_everything_3.go +++ b/examples/internal/clients/abe/model_a_bit_of_everything_3.go @@ -16,36 +16,36 @@ import ( // Intentionally complicated message type to cover many features of Protobuf. type ABitOfEverything3 struct { - SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` + Nested []ABitOfEverythingNested `json:"nested,omitempty"` // Float value field - FloatValue float32 `json:"floatValue"` - DoubleValue float64 `json:"doubleValue"` - Int64Value string `json:"int64Value"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + FloatValue float32 `json:"floatValue"` + DoubleValue float64 `json:"doubleValue"` + Int64Value string `json:"int64Value"` + Uint64Value string `json:"uint64Value,omitempty"` + Int32Value int32 `json:"int32Value,omitempty"` + Fixed64Value string `json:"fixed64Value,omitempty"` + Fixed32Value int64 `json:"fixed32Value,omitempty"` + BoolValue bool `json:"boolValue,omitempty"` + StringValue string `json:"stringValue,omitempty"` + BytesValue string `json:"bytesValue,omitempty"` + Uint32Value int64 `json:"uint32Value,omitempty"` + EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` + Sfixed32Value int32 `json:"sfixed32Value,omitempty"` + Sfixed64Value string `json:"sfixed64Value,omitempty"` + Sint32Value int32 `json:"sint32Value,omitempty"` + Sint64Value string `json:"sint64Value,omitempty"` + RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` + OneofEmpty *any `json:"oneofEmpty,omitempty"` + OneofString string `json:"oneofString,omitempty"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` + NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` + TimestampValue time.Time `json:"timestampValue,omitempty"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` // Repeated numeric enum description. RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` // Numeric enum description. @@ -55,14 +55,14 @@ type ABitOfEverything3 struct { // Repeated nested object description. RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` // Nested object description. - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` + Int64OverrideType int64 `json:"int64OverrideType,omitempty"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` // Only digits are allowed. - ProductId []string `json:"productId,omitempty"` - OptionalStringField string `json:"optionalStringField,omitempty"` - RequiredStringField1 string `json:"requiredStringField1"` - RequiredStringField2 string `json:"requiredStringField2"` + ProductId []string `json:"productId,omitempty"` + OptionalStringField string `json:"optionalStringField,omitempty"` + RequiredStringField1 string `json:"requiredStringField1"` + RequiredStringField2 string `json:"requiredStringField2"` } diff --git a/examples/internal/clients/abe/model_a_bit_of_everything_4.go b/examples/internal/clients/abe/model_a_bit_of_everything_4.go index 55ebca9..7ed6a64 100644 --- a/examples/internal/clients/abe/model_a_bit_of_everything_4.go +++ b/examples/internal/clients/abe/model_a_bit_of_everything_4.go @@ -16,36 +16,36 @@ import ( // Intentionally complicated message type to cover many features of Protobuf. type ABitOfEverything4 struct { - SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` + Nested []ABitOfEverythingNested `json:"nested,omitempty"` // Float value field - FloatValue float32 `json:"floatValue,omitempty"` - DoubleValue float64 `json:"doubleValue,omitempty"` - Int64Value string `json:"int64Value,omitempty"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + FloatValue float32 `json:"floatValue,omitempty"` + DoubleValue float64 `json:"doubleValue,omitempty"` + Int64Value string `json:"int64Value,omitempty"` + Uint64Value string `json:"uint64Value,omitempty"` + Int32Value int32 `json:"int32Value,omitempty"` + Fixed64Value string `json:"fixed64Value,omitempty"` + Fixed32Value int64 `json:"fixed32Value,omitempty"` + BoolValue bool `json:"boolValue,omitempty"` + StringValue string `json:"stringValue,omitempty"` + BytesValue string `json:"bytesValue,omitempty"` + Uint32Value int64 `json:"uint32Value,omitempty"` + EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` + Sfixed32Value int32 `json:"sfixed32Value,omitempty"` + Sfixed64Value string `json:"sfixed64Value,omitempty"` + Sint32Value int32 `json:"sint32Value,omitempty"` + Sint64Value string `json:"sint64Value,omitempty"` + RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` + OneofEmpty *any `json:"oneofEmpty,omitempty"` + OneofString string `json:"oneofString,omitempty"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` + NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` + TimestampValue time.Time `json:"timestampValue,omitempty"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` // Repeated numeric enum description. RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` // Numeric enum description. @@ -55,14 +55,14 @@ type ABitOfEverything4 struct { // Repeated nested object description. RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` // Nested object description. - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation,omitempty"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` + Int64OverrideType int64 `json:"int64OverrideType,omitempty"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation,omitempty"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` // Only digits are allowed. - ProductId []string `json:"productId,omitempty"` - OptionalStringField string `json:"optionalStringField,omitempty"` - RequiredStringField1 string `json:"requiredStringField1,omitempty"` - RequiredStringField2 string `json:"requiredStringField2,omitempty"` + ProductId []string `json:"productId,omitempty"` + OptionalStringField string `json:"optionalStringField,omitempty"` + RequiredStringField1 string `json:"requiredStringField1,omitempty"` + RequiredStringField2 string `json:"requiredStringField2,omitempty"` } diff --git a/examples/internal/clients/abe/model_a_bit_of_everything_5.go b/examples/internal/clients/abe/model_a_bit_of_everything_5.go index bf59a17..233808a 100644 --- a/examples/internal/clients/abe/model_a_bit_of_everything_5.go +++ b/examples/internal/clients/abe/model_a_bit_of_everything_5.go @@ -8,52 +8,53 @@ * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package abe + import ( "time" ) // Intentionally complicated message type to cover many features of Protobuf. type ABitOfEverything5 struct { - SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` + Nested []ABitOfEverythingNested `json:"nested,omitempty"` // Float value field - FloatValue float32 `json:"floatValue"` - DoubleValue float64 `json:"doubleValue"` - Int64Value string `json:"int64Value"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + FloatValue float32 `json:"floatValue"` + DoubleValue float64 `json:"doubleValue"` + Int64Value string `json:"int64Value"` + Uint64Value string `json:"uint64Value,omitempty"` + Int32Value int32 `json:"int32Value,omitempty"` + Fixed64Value string `json:"fixed64Value,omitempty"` + Fixed32Value int64 `json:"fixed32Value,omitempty"` + BoolValue bool `json:"boolValue,omitempty"` + StringValue string `json:"stringValue,omitempty"` + BytesValue string `json:"bytesValue,omitempty"` + Uint32Value int64 `json:"uint32Value,omitempty"` + EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` + Sfixed32Value int32 `json:"sfixed32Value,omitempty"` + Sfixed64Value string `json:"sfixed64Value,omitempty"` + Sint32Value int32 `json:"sint32Value,omitempty"` + Sint64Value string `json:"sint64Value,omitempty"` + RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` + OneofEmpty *any `json:"oneofEmpty,omitempty"` + OneofString string `json:"oneofString,omitempty"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` + NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` + TimestampValue time.Time `json:"timestampValue,omitempty"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` // Repeated numeric enum description. RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` - EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation,omitempty"` + EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation,omitempty"` // Repeated string description. RepeatedStringAnnotation []string `json:"repeatedStringAnnotation,omitempty"` // Repeated nested object description. - RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` + Int64OverrideType int64 `json:"int64OverrideType,omitempty"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` } diff --git a/examples/internal/clients/abe/model_a_bit_of_everything_6.go b/examples/internal/clients/abe/model_a_bit_of_everything_6.go index 468fb91..48cf378 100644 --- a/examples/internal/clients/abe/model_a_bit_of_everything_6.go +++ b/examples/internal/clients/abe/model_a_bit_of_everything_6.go @@ -8,52 +8,53 @@ * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package abe + import ( "time" ) // Intentionally complicated message type to cover many features of Protobuf. type ABitOfEverything6 struct { - SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` + Nested []ABitOfEverythingNested `json:"nested,omitempty"` // Float value field - FloatValue float32 `json:"floatValue"` - DoubleValue float64 `json:"doubleValue"` - Int64Value string `json:"int64Value"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + FloatValue float32 `json:"floatValue"` + DoubleValue float64 `json:"doubleValue"` + Int64Value string `json:"int64Value"` + Uint64Value string `json:"uint64Value,omitempty"` + Int32Value int32 `json:"int32Value,omitempty"` + Fixed64Value string `json:"fixed64Value,omitempty"` + Fixed32Value int64 `json:"fixed32Value,omitempty"` + BoolValue bool `json:"boolValue,omitempty"` + StringValue string `json:"stringValue,omitempty"` + BytesValue string `json:"bytesValue,omitempty"` + Uint32Value int64 `json:"uint32Value,omitempty"` + EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` + Sfixed32Value int32 `json:"sfixed32Value,omitempty"` + Sfixed64Value string `json:"sfixed64Value,omitempty"` + Sint32Value int32 `json:"sint32Value,omitempty"` + Sint64Value string `json:"sint64Value,omitempty"` + RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` + OneofEmpty *any `json:"oneofEmpty,omitempty"` + OneofString string `json:"oneofString,omitempty"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` + NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` + TimestampValue time.Time `json:"timestampValue,omitempty"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` // Repeated numeric enum description. RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` - EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation,omitempty"` + EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation,omitempty"` // Repeated string description. RepeatedStringAnnotation []string `json:"repeatedStringAnnotation,omitempty"` // Repeated nested object description. - RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` + Int64OverrideType int64 `json:"int64OverrideType,omitempty"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` } diff --git a/examples/internal/clients/abe/model_a_bit_of_everything_7.go b/examples/internal/clients/abe/model_a_bit_of_everything_7.go index e72e74f..223b52f 100644 --- a/examples/internal/clients/abe/model_a_bit_of_everything_7.go +++ b/examples/internal/clients/abe/model_a_bit_of_everything_7.go @@ -8,52 +8,53 @@ * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package abe + import ( "time" ) // Intentionally complicated message type to cover many features of Protobuf. type ABitOfEverything7 struct { - SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` + Nested []ABitOfEverythingNested `json:"nested,omitempty"` // Float value field - FloatValue float32 `json:"floatValue"` - DoubleValue float64 `json:"doubleValue"` - Int64Value string `json:"int64Value"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + FloatValue float32 `json:"floatValue"` + DoubleValue float64 `json:"doubleValue"` + Int64Value string `json:"int64Value"` + Uint64Value string `json:"uint64Value,omitempty"` + Int32Value int32 `json:"int32Value,omitempty"` + Fixed64Value string `json:"fixed64Value,omitempty"` + Fixed32Value int64 `json:"fixed32Value,omitempty"` + BoolValue bool `json:"boolValue,omitempty"` + StringValue string `json:"stringValue,omitempty"` + BytesValue string `json:"bytesValue,omitempty"` + Uint32Value int64 `json:"uint32Value,omitempty"` + EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` + Sfixed32Value int32 `json:"sfixed32Value,omitempty"` + Sfixed64Value string `json:"sfixed64Value,omitempty"` + Sint32Value int32 `json:"sint32Value,omitempty"` + Sint64Value string `json:"sint64Value,omitempty"` + RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` + OneofEmpty *any `json:"oneofEmpty,omitempty"` + OneofString string `json:"oneofString,omitempty"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` + NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` + TimestampValue time.Time `json:"timestampValue,omitempty"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` // Repeated numeric enum description. RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` - EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation,omitempty"` + EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation,omitempty"` // Repeated string description. RepeatedStringAnnotation []string `json:"repeatedStringAnnotation,omitempty"` // Repeated nested object description. - RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` + Int64OverrideType int64 `json:"int64OverrideType,omitempty"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` } diff --git a/examples/internal/clients/abe/model_a_bit_of_everything_8.go b/examples/internal/clients/abe/model_a_bit_of_everything_8.go index e9a940b..c52c147 100644 --- a/examples/internal/clients/abe/model_a_bit_of_everything_8.go +++ b/examples/internal/clients/abe/model_a_bit_of_everything_8.go @@ -8,52 +8,53 @@ * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) */ package abe + import ( "time" ) // Intentionally complicated message type to cover many features of Protobuf. type ABitOfEverything8 struct { - SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` + Nested []ABitOfEverythingNested `json:"nested,omitempty"` // Float value field - FloatValue float32 `json:"floatValue"` - DoubleValue float64 `json:"doubleValue"` - Int64Value string `json:"int64Value"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + FloatValue float32 `json:"floatValue"` + DoubleValue float64 `json:"doubleValue"` + Int64Value string `json:"int64Value"` + Uint64Value string `json:"uint64Value,omitempty"` + Int32Value int32 `json:"int32Value,omitempty"` + Fixed64Value string `json:"fixed64Value,omitempty"` + Fixed32Value int64 `json:"fixed32Value,omitempty"` + BoolValue bool `json:"boolValue,omitempty"` + StringValue string `json:"stringValue,omitempty"` + BytesValue string `json:"bytesValue,omitempty"` + Uint32Value int64 `json:"uint32Value,omitempty"` + EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` + Sfixed32Value int32 `json:"sfixed32Value,omitempty"` + Sfixed64Value string `json:"sfixed64Value,omitempty"` + Sint32Value int32 `json:"sint32Value,omitempty"` + Sint64Value string `json:"sint64Value,omitempty"` + RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` + OneofEmpty *any `json:"oneofEmpty,omitempty"` + OneofString string `json:"oneofString,omitempty"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` + NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` + TimestampValue time.Time `json:"timestampValue,omitempty"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` // Repeated numeric enum description. RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` - EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation,omitempty"` + EnumValueAnnotation *ExamplepbNumericEnum `json:"enumValueAnnotation,omitempty"` // Repeated string description. RepeatedStringAnnotation []string `json:"repeatedStringAnnotation,omitempty"` // Repeated nested object description. - RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` + Int64OverrideType int64 `json:"int64OverrideType,omitempty"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` } diff --git a/examples/internal/clients/abe/model_examplepb_a_bit_of_everything.go b/examples/internal/clients/abe/model_examplepb_a_bit_of_everything.go index 6ba1ac6..02b2e8f 100644 --- a/examples/internal/clients/abe/model_examplepb_a_bit_of_everything.go +++ b/examples/internal/clients/abe/model_examplepb_a_bit_of_everything.go @@ -16,37 +16,37 @@ import ( // Intentionally complicated message type to cover many features of Protobuf. type ExamplepbABitOfEverything struct { - SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` - Uuid string `json:"uuid"` - Nested []ABitOfEverythingNested `json:"nested,omitempty"` + SingleNested *ABitOfEverythingNested `json:"singleNested,omitempty"` + Uuid string `json:"uuid"` + Nested []ABitOfEverythingNested `json:"nested,omitempty"` // Float value field - FloatValue float32 `json:"floatValue"` - DoubleValue float64 `json:"doubleValue"` - Int64Value string `json:"int64Value"` - Uint64Value string `json:"uint64Value,omitempty"` - Int32Value int32 `json:"int32Value,omitempty"` - Fixed64Value string `json:"fixed64Value,omitempty"` - Fixed32Value int64 `json:"fixed32Value,omitempty"` - BoolValue bool `json:"boolValue,omitempty"` - StringValue string `json:"stringValue,omitempty"` - BytesValue string `json:"bytesValue,omitempty"` - Uint32Value int64 `json:"uint32Value,omitempty"` - EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` - PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` - NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` - Sfixed32Value int32 `json:"sfixed32Value,omitempty"` - Sfixed64Value string `json:"sfixed64Value,omitempty"` - Sint32Value int32 `json:"sint32Value,omitempty"` - Sint64Value string `json:"sint64Value,omitempty"` - RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` - OneofEmpty *interface{} `json:"oneofEmpty,omitempty"` - OneofString string `json:"oneofString,omitempty"` - MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` - MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` - MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` - NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` - TimestampValue time.Time `json:"timestampValue,omitempty"` - RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` + FloatValue float32 `json:"floatValue"` + DoubleValue float64 `json:"doubleValue"` + Int64Value string `json:"int64Value"` + Uint64Value string `json:"uint64Value,omitempty"` + Int32Value int32 `json:"int32Value,omitempty"` + Fixed64Value string `json:"fixed64Value,omitempty"` + Fixed32Value int64 `json:"fixed32Value,omitempty"` + BoolValue bool `json:"boolValue,omitempty"` + StringValue string `json:"stringValue,omitempty"` + BytesValue string `json:"bytesValue,omitempty"` + Uint32Value int64 `json:"uint32Value,omitempty"` + EnumValue *ExamplepbNumericEnum `json:"enumValue,omitempty"` + PathEnumValue *PathenumPathEnum `json:"pathEnumValue,omitempty"` + NestedPathEnumValue *MessagePathEnumNestedPathEnum `json:"nestedPathEnumValue,omitempty"` + Sfixed32Value int32 `json:"sfixed32Value,omitempty"` + Sfixed64Value string `json:"sfixed64Value,omitempty"` + Sint32Value int32 `json:"sint32Value,omitempty"` + Sint64Value string `json:"sint64Value,omitempty"` + RepeatedStringValue []string `json:"repeatedStringValue,omitempty"` + OneofEmpty *any `json:"oneofEmpty,omitempty"` + OneofString string `json:"oneofString,omitempty"` + MapValue map[string]ExamplepbNumericEnum `json:"mapValue,omitempty"` + MappedStringValue map[string]string `json:"mappedStringValue,omitempty"` + MappedNestedValue map[string]ABitOfEverythingNested `json:"mappedNestedValue,omitempty"` + NonConventionalNameValue string `json:"nonConventionalNameValue,omitempty"` + TimestampValue time.Time `json:"timestampValue,omitempty"` + RepeatedEnumValue []ExamplepbNumericEnum `json:"repeatedEnumValue,omitempty"` // Repeated numeric enum description. RepeatedEnumAnnotation []ExamplepbNumericEnum `json:"repeatedEnumAnnotation,omitempty"` // Numeric enum description. @@ -56,14 +56,14 @@ type ExamplepbABitOfEverything struct { // Repeated nested object description. RepeatedNestedAnnotation []ABitOfEverythingNested `json:"repeatedNestedAnnotation,omitempty"` // Nested object description. - NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` - Int64OverrideType int64 `json:"int64OverrideType,omitempty"` - RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` - OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` - OptionalStringValue string `json:"optionalStringValue,omitempty"` + NestedAnnotation *ABitOfEverythingNested `json:"nestedAnnotation,omitempty"` + Int64OverrideType int64 `json:"int64OverrideType,omitempty"` + RequiredStringViaFieldBehaviorAnnotation string `json:"requiredStringViaFieldBehaviorAnnotation"` + OutputOnlyStringViaFieldBehaviorAnnotation string `json:"outputOnlyStringViaFieldBehaviorAnnotation,omitempty"` + OptionalStringValue string `json:"optionalStringValue,omitempty"` // Only digits are allowed. - ProductId []string `json:"productId,omitempty"` - OptionalStringField string `json:"optionalStringField,omitempty"` - RequiredStringField1 string `json:"requiredStringField1"` - RequiredStringField2 string `json:"requiredStringField2"` + ProductId []string `json:"productId,omitempty"` + OptionalStringField string `json:"optionalStringField,omitempty"` + RequiredStringField1 string `json:"requiredStringField1"` + RequiredStringField2 string `json:"requiredStringField2"` } diff --git a/examples/internal/clients/echo/api_echo_service.go b/examples/internal/clients/echo/api_echo_service.go index 32dc2bb..de19a78 100644 --- a/examples/internal/clients/echo/api_echo_service.go +++ b/examples/internal/clients/echo/api_echo_service.go @@ -11,12 +11,12 @@ package echo import ( "context" + "fmt" + "github.com/antihax/optional" "io/ioutil" "net/http" "net/url" "strings" - "fmt" - "github.com/antihax/optional" ) // Linger please @@ -26,41 +26,41 @@ var ( type EchoServiceApiService service -/* +/* EchoServiceApiService Echo method receives a simple message and returns it. The message posted as the id parameter will also be returned. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param id Id represents the message identifier. * @param optional nil or *EchoServiceEchoOpts - Optional Parameters: - * @param "Num" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - + * @param "Num" (optional.String) - + * @param "LineNum" (optional.String) - + * @param "Lang" (optional.String) - + * @param "StatusProgress" (optional.String) - + * @param "StatusNote" (optional.String) - + * @param "En" (optional.String) - + * @param "NoProgress" (optional.String) - + * @param "NoNote" (optional.String) - @return ExamplepbSimpleMessage */ -type EchoServiceEchoOpts struct { - Num optional.String - LineNum optional.String - Lang optional.String +type EchoServiceEchoOpts struct { + Num optional.String + LineNum optional.String + Lang optional.String StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String + StatusNote optional.String + En optional.String + NoProgress optional.String + NoNote optional.String } func (a *EchoServiceApiService) EchoServiceEcho(ctx context.Context, id string, localVarOptionals *EchoServiceEchoOpts) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -131,80 +131,80 @@ func (a *EchoServiceApiService) EchoServiceEcho(ctx context.Context, id string, if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService Echo method receives a simple message and returns it. The message posted as the id parameter will also be returned. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param id Id represents the message identifier. * @param num * @param optional nil or *EchoServiceEcho2Opts - Optional Parameters: - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - + * @param "LineNum" (optional.String) - + * @param "Lang" (optional.String) - + * @param "StatusProgress" (optional.String) - + * @param "StatusNote" (optional.String) - + * @param "En" (optional.String) - + * @param "NoProgress" (optional.String) - + * @param "NoNote" (optional.String) - @return ExamplepbSimpleMessage */ -type EchoServiceEcho2Opts struct { - LineNum optional.String - Lang optional.String +type EchoServiceEcho2Opts struct { + LineNum optional.String + Lang optional.String StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String + StatusNote optional.String + En optional.String + NoProgress optional.String + NoNote optional.String } func (a *EchoServiceApiService) EchoServiceEcho2(ctx context.Context, id string, num string, localVarOptionals *EchoServiceEcho2Opts) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -273,47 +273,47 @@ func (a *EchoServiceApiService) EchoServiceEcho2(ctx context.Context, id string, if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService Echo method receives a simple message and returns it. The message posted as the id parameter will also be returned. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @@ -321,31 +321,31 @@ The message posted as the id parameter will also be returned. * @param num * @param lang * @param optional nil or *EchoServiceEcho3Opts - Optional Parameters: - * @param "LineNum" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - + * @param "LineNum" (optional.String) - + * @param "StatusProgress" (optional.String) - + * @param "StatusNote" (optional.String) - + * @param "En" (optional.String) - + * @param "NoProgress" (optional.String) - + * @param "NoNote" (optional.String) - @return ExamplepbSimpleMessage */ -type EchoServiceEcho3Opts struct { - LineNum optional.String +type EchoServiceEcho3Opts struct { + LineNum optional.String StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String + StatusNote optional.String + En optional.String + NoProgress optional.String + NoNote optional.String } func (a *EchoServiceApiService) EchoServiceEcho3(ctx context.Context, id string, num string, lang string, localVarOptionals *EchoServiceEcho3Opts) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -412,47 +412,47 @@ func (a *EchoServiceApiService) EchoServiceEcho3(ctx context.Context, id string, if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService Echo method receives a simple message and returns it. The message posted as the id parameter will also be returned. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @@ -460,29 +460,29 @@ The message posted as the id parameter will also be returned. * @param lineNum * @param statusNote * @param optional nil or *EchoServiceEcho4Opts - Optional Parameters: - * @param "Num" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - + * @param "Num" (optional.String) - + * @param "Lang" (optional.String) - + * @param "StatusProgress" (optional.String) - + * @param "En" (optional.String) - + * @param "NoProgress" (optional.String) - @return ExamplepbSimpleMessage */ -type EchoServiceEcho4Opts struct { - Num optional.String - Lang optional.String +type EchoServiceEcho4Opts struct { + Num optional.String + Lang optional.String StatusProgress optional.String - En optional.String - NoProgress optional.String + En optional.String + NoProgress optional.String } func (a *EchoServiceApiService) EchoServiceEcho4(ctx context.Context, id string, lineNum string, statusNote string, localVarOptionals *EchoServiceEcho4Opts) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -546,79 +546,79 @@ func (a *EchoServiceApiService) EchoServiceEcho4(ctx context.Context, id string, if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService Echo method receives a simple message and returns it. The message posted as the id parameter will also be returned. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param noNote * @param optional nil or *EchoServiceEcho5Opts - Optional Parameters: * @param "Id" (optional.String) - Id represents the message identifier. - * @param "Num" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - + * @param "Num" (optional.String) - + * @param "LineNum" (optional.String) - + * @param "Lang" (optional.String) - + * @param "StatusProgress" (optional.String) - + * @param "En" (optional.String) - + * @param "NoProgress" (optional.String) - @return ExamplepbSimpleMessage */ -type EchoServiceEcho5Opts struct { - Id optional.String - Num optional.String - LineNum optional.String - Lang optional.String +type EchoServiceEcho5Opts struct { + Id optional.String + Num optional.String + LineNum optional.String + Lang optional.String StatusProgress optional.String - En optional.String - NoProgress optional.String + En optional.String + NoProgress optional.String } func (a *EchoServiceApiService) EchoServiceEcho5(ctx context.Context, noNote string, localVarOptionals *EchoServiceEcho5Opts) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -686,59 +686,59 @@ func (a *EchoServiceApiService) EchoServiceEcho5(ctx context.Context, noNote str if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService EchoBody method receives a simple message and returns it. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param body SimpleMessage represents a simple message sent to the Echo service. + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param body SimpleMessage represents a simple message sent to the Echo service. @return ExamplepbSimpleMessage */ func (a *EchoServiceApiService) EchoServiceEchoBody(ctx context.Context, body ExamplepbSimpleMessage) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -786,77 +786,77 @@ func (a *EchoServiceApiService) EchoServiceEchoBody(ctx context.Context, body Ex if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService EchoBody method receives a simple message and returns it. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param id Id represents the message identifier. * @param no * @param optional nil or *EchoServiceEchoBody2Opts - Optional Parameters: - * @param "Num" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - + * @param "Num" (optional.String) - + * @param "LineNum" (optional.String) - + * @param "Lang" (optional.String) - + * @param "StatusProgress" (optional.String) - + * @param "StatusNote" (optional.String) - + * @param "En" (optional.String) - @return ExamplepbSimpleMessage */ -type EchoServiceEchoBody2Opts struct { - Num optional.String - LineNum optional.String - Lang optional.String +type EchoServiceEchoBody2Opts struct { + Num optional.String + LineNum optional.String + Lang optional.String StatusProgress optional.String - StatusNote optional.String - En optional.String + StatusNote optional.String + En optional.String } func (a *EchoServiceApiService) EchoServiceEchoBody2(ctx context.Context, id string, no ExamplepbEmbedded, localVarOptionals *EchoServiceEchoBody2Opts) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Put") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Put") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -923,81 +923,81 @@ func (a *EchoServiceApiService) EchoServiceEchoBody2(ctx context.Context, id str if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService EchoDelete method receives a simple message and returns it. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *EchoServiceEchoDeleteOpts - Optional Parameters: * @param "Id" (optional.String) - Id represents the message identifier. - * @param "Num" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - + * @param "Num" (optional.String) - + * @param "LineNum" (optional.String) - + * @param "Lang" (optional.String) - + * @param "StatusProgress" (optional.String) - + * @param "StatusNote" (optional.String) - + * @param "En" (optional.String) - + * @param "NoProgress" (optional.String) - + * @param "NoNote" (optional.String) - @return ExamplepbSimpleMessage */ -type EchoServiceEchoDeleteOpts struct { - Id optional.String - Num optional.String - LineNum optional.String - Lang optional.String +type EchoServiceEchoDeleteOpts struct { + Id optional.String + Num optional.String + LineNum optional.String + Lang optional.String StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String + StatusNote optional.String + En optional.String + NoProgress optional.String + NoNote optional.String } func (a *EchoServiceApiService) EchoServiceEchoDelete(ctx context.Context, localVarOptionals *EchoServiceEchoDeleteOpts) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Delete") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Delete") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -1070,66 +1070,66 @@ func (a *EchoServiceApiService) EchoServiceEchoDelete(ctx context.Context, local if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService EchoPatch method receives a NonStandardUpdateRequest and returns it. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param body * @param optional nil or *EchoServiceEchoPatchOpts - Optional Parameters: - * @param "UpdateMask" (optional.String) - + * @param "UpdateMask" (optional.String) - @return ExamplepbDynamicMessageUpdate */ -type EchoServiceEchoPatchOpts struct { +type EchoServiceEchoPatchOpts struct { UpdateMask optional.String } func (a *EchoServiceApiService) EchoServiceEchoPatch(ctx context.Context, body ExamplepbDynamicMessage, localVarOptionals *EchoServiceEchoPatchOpts) (ExamplepbDynamicMessageUpdate, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Patch") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Patch") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbDynamicMessageUpdate ) @@ -1180,81 +1180,81 @@ func (a *EchoServiceApiService) EchoServiceEchoPatch(ctx context.Context, body E if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbDynamicMessageUpdate - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* EchoServiceApiService EchoUnauthorized method receives a simple message and returns it. It must always return a google.rpc.Code of `UNAUTHENTICATED` and a HTTP Status code of 401. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param optional nil or *EchoServiceEchoUnauthorizedOpts - Optional Parameters: * @param "Id" (optional.String) - Id represents the message identifier. - * @param "Num" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - + * @param "Num" (optional.String) - + * @param "LineNum" (optional.String) - + * @param "Lang" (optional.String) - + * @param "StatusProgress" (optional.String) - + * @param "StatusNote" (optional.String) - + * @param "En" (optional.String) - + * @param "NoProgress" (optional.String) - + * @param "NoNote" (optional.String) - @return ExamplepbSimpleMessage */ -type EchoServiceEchoUnauthorizedOpts struct { - Id optional.String - Num optional.String - LineNum optional.String - Lang optional.String +type EchoServiceEchoUnauthorizedOpts struct { + Id optional.String + Num optional.String + LineNum optional.String + Lang optional.String StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String + StatusNote optional.String + En optional.String + NoProgress optional.String + NoNote optional.String } func (a *EchoServiceApiService) EchoServiceEchoUnauthorized(ctx context.Context, localVarOptionals *EchoServiceEchoUnauthorizedOpts) (ExamplepbSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbSimpleMessage ) @@ -1327,40 +1327,40 @@ func (a *EchoServiceApiService) EchoServiceEchoUnauthorized(ctx context.Context, if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } diff --git a/examples/internal/clients/echo/client.go b/examples/internal/clients/echo/client.go index d0e2045..1760172 100644 --- a/examples/internal/clients/echo/client.go +++ b/examples/internal/clients/echo/client.go @@ -108,7 +108,7 @@ func contains(haystack []string, needle string) bool { } // Verify optional parameters are of the correct type. -func typeCheckParameter(obj interface{}, expected string, name string) error { +func typeCheckParameter(obj any, expected string, name string) error { // Make sure there is an object. if obj == nil { return nil @@ -122,7 +122,7 @@ func typeCheckParameter(obj interface{}, expected string, name string) error { } // parameterToString convert interface{} parameters to string, using a delimiter if format is provided. -func parameterToString(obj interface{}, collectionFormat string) string { +func parameterToString(obj any, collectionFormat string) string { var delimiter string switch collectionFormat { @@ -157,7 +157,7 @@ func (c *APIClient) ChangeBasePath(path string) { func (c *APIClient) prepareRequest( ctx context.Context, path string, method string, - postBody interface{}, + postBody any, headerParams map[string]string, queryParams url.Values, formParams url.Values, @@ -299,18 +299,18 @@ func (c *APIClient) prepareRequest( return localVarRequest, nil } -func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err error) { - if strings.Contains(contentType, "application/xml") { - if err = xml.Unmarshal(b, v); err != nil { - return err - } - return nil - } else if strings.Contains(contentType, "application/json") { - if err = json.Unmarshal(b, v); err != nil { - return err - } - return nil +func (c *APIClient) decode(v any, b []byte, contentType string) (err error) { + if strings.Contains(contentType, "application/xml") { + if err = xml.Unmarshal(b, v); err != nil { + return err + } + return nil + } else if strings.Contains(contentType, "application/json") { + if err = json.Unmarshal(b, v); err != nil { + return err } + return nil + } return errors.New("undefined response type") } @@ -332,12 +332,12 @@ func addFile(w *multipart.Writer, fieldName, path string) error { } // Prevent trying to import "fmt" -func reportError(format string, a ...interface{}) error { +func reportError(format string, a ...any) error { return fmt.Errorf(format, a...) } // Set request body from an interface{} -func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) { +func setBody(body any, contentType string) (bodyBuf *bytes.Buffer, err error) { if bodyBuf == nil { bodyBuf = &bytes.Buffer{} } @@ -368,7 +368,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e } // detectContentType method is used to figure out `Request.Body` content type for request header -func detectContentType(body interface{}) string { +func detectContentType(body any) string { contentType := "text/plain; charset=utf-8" kind := reflect.TypeOf(body).Kind() @@ -445,7 +445,7 @@ func strlen(s string) int { type GenericSwaggerError struct { body []byte error string - model interface{} + model any } // Error returns non-empty string if there was an error. @@ -459,6 +459,6 @@ func (e GenericSwaggerError) Body() []byte { } // Model returns the unpacked model of the error -func (e GenericSwaggerError) Model() interface{} { +func (e GenericSwaggerError) Model() any { return e.model -} \ No newline at end of file +} diff --git a/examples/internal/clients/echo/model_examplepb_dynamic_message.go b/examples/internal/clients/echo/model_examplepb_dynamic_message.go index dae5858..cd6592b 100644 --- a/examples/internal/clients/echo/model_examplepb_dynamic_message.go +++ b/examples/internal/clients/echo/model_examplepb_dynamic_message.go @@ -11,6 +11,6 @@ package echo // DynamicMessage represents a message which can have its structure built dynamically using Struct and Values. type ExamplepbDynamicMessage struct { - StructField *interface{} `json:"structField,omitempty"` - ValueField *interface{} `json:"valueField,omitempty"` + StructField *any `json:"structField,omitempty"` + ValueField *any `json:"valueField,omitempty"` } diff --git a/examples/internal/clients/generateunboundmethods/api_generate_unbound_methods_echo_service.go b/examples/internal/clients/generateunboundmethods/api_generate_unbound_methods_echo_service.go index dd9c050..94041da 100644 --- a/examples/internal/clients/generateunboundmethods/api_generate_unbound_methods_echo_service.go +++ b/examples/internal/clients/generateunboundmethods/api_generate_unbound_methods_echo_service.go @@ -24,20 +24,20 @@ var ( type GenerateUnboundMethodsEchoServiceApiService service -/* +/* GenerateUnboundMethodsEchoServiceApiService Echo method receives a simple message and returns it. The message posted as the id parameter will also be returned. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param body GenerateUnboundMethodsSimpleMessage represents a simple message sent to the unannotated GenerateUnboundMethodsEchoService service. + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param body GenerateUnboundMethodsSimpleMessage represents a simple message sent to the unannotated GenerateUnboundMethodsEchoService service. @return ExamplepbGenerateUnboundMethodsSimpleMessage */ func (a *GenerateUnboundMethodsEchoServiceApiService) GenerateUnboundMethodsEchoServiceEcho(ctx context.Context, body ExamplepbGenerateUnboundMethodsSimpleMessage) (ExamplepbGenerateUnboundMethodsSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbGenerateUnboundMethodsSimpleMessage ) @@ -85,59 +85,59 @@ func (a *GenerateUnboundMethodsEchoServiceApiService) GenerateUnboundMethodsEcho if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbGenerateUnboundMethodsSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* GenerateUnboundMethodsEchoServiceApiService EchoBody method receives a simple message and returns it. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param body GenerateUnboundMethodsSimpleMessage represents a simple message sent to the unannotated GenerateUnboundMethodsEchoService service. + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param body GenerateUnboundMethodsSimpleMessage represents a simple message sent to the unannotated GenerateUnboundMethodsEchoService service. @return ExamplepbGenerateUnboundMethodsSimpleMessage */ func (a *GenerateUnboundMethodsEchoServiceApiService) GenerateUnboundMethodsEchoServiceEchoBody(ctx context.Context, body ExamplepbGenerateUnboundMethodsSimpleMessage) (ExamplepbGenerateUnboundMethodsSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbGenerateUnboundMethodsSimpleMessage ) @@ -185,59 +185,59 @@ func (a *GenerateUnboundMethodsEchoServiceApiService) GenerateUnboundMethodsEcho if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbGenerateUnboundMethodsSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* GenerateUnboundMethodsEchoServiceApiService EchoDelete method receives a simple message and returns it. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param body GenerateUnboundMethodsSimpleMessage represents a simple message sent to the unannotated GenerateUnboundMethodsEchoService service. + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param body GenerateUnboundMethodsSimpleMessage represents a simple message sent to the unannotated GenerateUnboundMethodsEchoService service. @return ExamplepbGenerateUnboundMethodsSimpleMessage */ func (a *GenerateUnboundMethodsEchoServiceApiService) GenerateUnboundMethodsEchoServiceEchoDelete(ctx context.Context, body ExamplepbGenerateUnboundMethodsSimpleMessage) (ExamplepbGenerateUnboundMethodsSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbGenerateUnboundMethodsSimpleMessage ) @@ -285,40 +285,40 @@ func (a *GenerateUnboundMethodsEchoServiceApiService) GenerateUnboundMethodsEcho if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbGenerateUnboundMethodsSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } diff --git a/examples/internal/clients/generateunboundmethods/client.go b/examples/internal/clients/generateunboundmethods/client.go index 1c81380..fb485be 100644 --- a/examples/internal/clients/generateunboundmethods/client.go +++ b/examples/internal/clients/generateunboundmethods/client.go @@ -108,7 +108,7 @@ func contains(haystack []string, needle string) bool { } // Verify optional parameters are of the correct type. -func typeCheckParameter(obj interface{}, expected string, name string) error { +func typeCheckParameter(obj any, expected string, name string) error { // Make sure there is an object. if obj == nil { return nil @@ -122,7 +122,7 @@ func typeCheckParameter(obj interface{}, expected string, name string) error { } // parameterToString convert interface{} parameters to string, using a delimiter if format is provided. -func parameterToString(obj interface{}, collectionFormat string) string { +func parameterToString(obj any, collectionFormat string) string { var delimiter string switch collectionFormat { @@ -157,7 +157,7 @@ func (c *APIClient) ChangeBasePath(path string) { func (c *APIClient) prepareRequest( ctx context.Context, path string, method string, - postBody interface{}, + postBody any, headerParams map[string]string, queryParams url.Values, formParams url.Values, @@ -299,18 +299,18 @@ func (c *APIClient) prepareRequest( return localVarRequest, nil } -func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err error) { - if strings.Contains(contentType, "application/xml") { - if err = xml.Unmarshal(b, v); err != nil { - return err - } - return nil - } else if strings.Contains(contentType, "application/json") { - if err = json.Unmarshal(b, v); err != nil { - return err - } - return nil +func (c *APIClient) decode(v any, b []byte, contentType string) (err error) { + if strings.Contains(contentType, "application/xml") { + if err = xml.Unmarshal(b, v); err != nil { + return err + } + return nil + } else if strings.Contains(contentType, "application/json") { + if err = json.Unmarshal(b, v); err != nil { + return err } + return nil + } return errors.New("undefined response type") } @@ -332,12 +332,12 @@ func addFile(w *multipart.Writer, fieldName, path string) error { } // Prevent trying to import "fmt" -func reportError(format string, a ...interface{}) error { +func reportError(format string, a ...any) error { return fmt.Errorf(format, a...) } // Set request body from an interface{} -func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) { +func setBody(body any, contentType string) (bodyBuf *bytes.Buffer, err error) { if bodyBuf == nil { bodyBuf = &bytes.Buffer{} } @@ -368,7 +368,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e } // detectContentType method is used to figure out `Request.Body` content type for request header -func detectContentType(body interface{}) string { +func detectContentType(body any) string { contentType := "text/plain; charset=utf-8" kind := reflect.TypeOf(body).Kind() @@ -445,7 +445,7 @@ func strlen(s string) int { type GenericSwaggerError struct { body []byte error string - model interface{} + model any } // Error returns non-empty string if there was an error. @@ -459,6 +459,6 @@ func (e GenericSwaggerError) Body() []byte { } // Model returns the unpacked model of the error -func (e GenericSwaggerError) Model() interface{} { +func (e GenericSwaggerError) Model() any { return e.model -} \ No newline at end of file +} diff --git a/examples/internal/clients/responsebody/api_response_body_service.go b/examples/internal/clients/responsebody/api_response_body_service.go index 4421adf..c8e3e4a 100644 --- a/examples/internal/clients/responsebody/api_response_body_service.go +++ b/examples/internal/clients/responsebody/api_response_body_service.go @@ -11,11 +11,11 @@ package responsebody import ( "context" + "fmt" "io/ioutil" "net/http" "net/url" "strings" - "fmt" ) // Linger please @@ -25,19 +25,19 @@ var ( type ResponseBodyServiceApiService service -/* +/* ResponseBodyServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param data + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param data @return ExamplepbResponseBodyOutResponse */ func (a *ResponseBodyServiceApiService) ResponseBodyServiceGetResponseBody(ctx context.Context, data string) (ExamplepbResponseBodyOutResponse, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbResponseBodyOutResponse ) @@ -84,59 +84,59 @@ func (a *ResponseBodyServiceApiService) ResponseBodyServiceGetResponseBody(ctx c if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbResponseBodyOutResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ResponseBodyServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param data + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param data @return StreamResultOfExamplepbResponseBodyOut */ func (a *ResponseBodyServiceApiService) ResponseBodyServiceGetResponseBodyStream(ctx context.Context, data string) (StreamResultOfExamplepbResponseBodyOut, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue StreamResultOfExamplepbResponseBodyOut ) @@ -183,59 +183,59 @@ func (a *ResponseBodyServiceApiService) ResponseBodyServiceGetResponseBodyStream if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v StreamResultOfExamplepbResponseBodyOut - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ResponseBodyServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param data + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param data @return []ExamplepbRepeatedResponseBodyOutResponse */ func (a *ResponseBodyServiceApiService) ResponseBodyServiceListResponseBodies(ctx context.Context, data string) ([]ExamplepbRepeatedResponseBodyOutResponse, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue []ExamplepbRepeatedResponseBodyOutResponse ) @@ -282,59 +282,59 @@ func (a *ResponseBodyServiceApiService) ResponseBodyServiceListResponseBodies(ct if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v []ExamplepbRepeatedResponseBodyOutResponse - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* ResponseBodyServiceApiService - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param data + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param data @return []string */ func (a *ResponseBodyServiceApiService) ResponseBodyServiceListResponseStrings(ctx context.Context, data string) ([]string, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue []string ) @@ -381,40 +381,40 @@ func (a *ResponseBodyServiceApiService) ResponseBodyServiceListResponseStrings(c if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v []string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } diff --git a/examples/internal/clients/responsebody/client.go b/examples/internal/clients/responsebody/client.go index dfe97e5..574efcd 100644 --- a/examples/internal/clients/responsebody/client.go +++ b/examples/internal/clients/responsebody/client.go @@ -108,7 +108,7 @@ func contains(haystack []string, needle string) bool { } // Verify optional parameters are of the correct type. -func typeCheckParameter(obj interface{}, expected string, name string) error { +func typeCheckParameter(obj any, expected string, name string) error { // Make sure there is an object. if obj == nil { return nil @@ -122,7 +122,7 @@ func typeCheckParameter(obj interface{}, expected string, name string) error { } // parameterToString convert interface{} parameters to string, using a delimiter if format is provided. -func parameterToString(obj interface{}, collectionFormat string) string { +func parameterToString(obj any, collectionFormat string) string { var delimiter string switch collectionFormat { @@ -157,7 +157,7 @@ func (c *APIClient) ChangeBasePath(path string) { func (c *APIClient) prepareRequest( ctx context.Context, path string, method string, - postBody interface{}, + postBody any, headerParams map[string]string, queryParams url.Values, formParams url.Values, @@ -299,18 +299,18 @@ func (c *APIClient) prepareRequest( return localVarRequest, nil } -func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err error) { - if strings.Contains(contentType, "application/xml") { - if err = xml.Unmarshal(b, v); err != nil { - return err - } - return nil - } else if strings.Contains(contentType, "application/json") { - if err = json.Unmarshal(b, v); err != nil { - return err - } - return nil +func (c *APIClient) decode(v any, b []byte, contentType string) (err error) { + if strings.Contains(contentType, "application/xml") { + if err = xml.Unmarshal(b, v); err != nil { + return err + } + return nil + } else if strings.Contains(contentType, "application/json") { + if err = json.Unmarshal(b, v); err != nil { + return err } + return nil + } return errors.New("undefined response type") } @@ -332,12 +332,12 @@ func addFile(w *multipart.Writer, fieldName, path string) error { } // Prevent trying to import "fmt" -func reportError(format string, a ...interface{}) error { +func reportError(format string, a ...any) error { return fmt.Errorf(format, a...) } // Set request body from an interface{} -func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) { +func setBody(body any, contentType string) (bodyBuf *bytes.Buffer, err error) { if bodyBuf == nil { bodyBuf = &bytes.Buffer{} } @@ -368,7 +368,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e } // detectContentType method is used to figure out `Request.Body` content type for request header -func detectContentType(body interface{}) string { +func detectContentType(body any) string { contentType := "text/plain; charset=utf-8" kind := reflect.TypeOf(body).Kind() @@ -445,7 +445,7 @@ func strlen(s string) int { type GenericSwaggerError struct { body []byte error string - model interface{} + model any } // Error returns non-empty string if there was an error. @@ -459,6 +459,6 @@ func (e GenericSwaggerError) Body() []byte { } // Model returns the unpacked model of the error -func (e GenericSwaggerError) Model() interface{} { +func (e GenericSwaggerError) Model() any { return e.model -} \ No newline at end of file +} diff --git a/examples/internal/clients/unannotatedecho/api_unannotated_echo_service.go b/examples/internal/clients/unannotatedecho/api_unannotated_echo_service.go index 70697ae..0dd0a94 100644 --- a/examples/internal/clients/unannotatedecho/api_unannotated_echo_service.go +++ b/examples/internal/clients/unannotatedecho/api_unannotated_echo_service.go @@ -12,12 +12,12 @@ package unannotatedecho import ( "context" + "fmt" + "github.com/antihax/optional" "io/ioutil" "net/http" "net/url" "strings" - "fmt" - "github.com/antihax/optional" ) // Linger please @@ -27,42 +27,42 @@ var ( type UnannotatedEchoServiceApiService service -/* +/* UnannotatedEchoServiceApiService Summary: Echo rpc Description Echo * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param id Id represents the message identifier. * @param num Int value field * @param optional nil or *UnannotatedEchoServiceEchoOpts - Optional Parameters: - * @param "Duration" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - + * @param "Duration" (optional.String) - + * @param "LineNum" (optional.String) - + * @param "Lang" (optional.String) - + * @param "StatusProgress" (optional.String) - + * @param "StatusNote" (optional.String) - + * @param "En" (optional.String) - + * @param "NoProgress" (optional.String) - + * @param "NoNote" (optional.String) - @return ExamplepbUnannotatedSimpleMessage */ -type UnannotatedEchoServiceEchoOpts struct { - Duration optional.String - LineNum optional.String - Lang optional.String +type UnannotatedEchoServiceEchoOpts struct { + Duration optional.String + LineNum optional.String + Lang optional.String StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String + StatusNote optional.String + En optional.String + NoProgress optional.String + NoNote optional.String } func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho(ctx context.Context, id string, num string, localVarOptionals *UnannotatedEchoServiceEchoOpts) (ExamplepbUnannotatedSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbUnannotatedSimpleMessage ) @@ -126,7 +126,7 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho(ctx contex key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -147,115 +147,115 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho(ctx contex if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbUnannotatedSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v int32 - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 503 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* UnannotatedEchoServiceApiService Summary: Echo rpc Description Echo * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param id Id represents the message identifier. * @param num Int value field * @param optional nil or *UnannotatedEchoServiceEcho2Opts - Optional Parameters: - * @param "Duration" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - + * @param "Duration" (optional.String) - + * @param "LineNum" (optional.String) - + * @param "Lang" (optional.String) - + * @param "StatusProgress" (optional.String) - + * @param "StatusNote" (optional.String) - + * @param "En" (optional.String) - + * @param "NoProgress" (optional.String) - + * @param "NoNote" (optional.String) - @return ExamplepbUnannotatedSimpleMessage */ -type UnannotatedEchoServiceEcho2Opts struct { - Duration optional.String - LineNum optional.String - Lang optional.String +type UnannotatedEchoServiceEcho2Opts struct { + Duration optional.String + LineNum optional.String + Lang optional.String StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String + StatusNote optional.String + En optional.String + NoProgress optional.String + NoNote optional.String } func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho2(ctx context.Context, id string, num string, localVarOptionals *UnannotatedEchoServiceEcho2Opts) (ExamplepbUnannotatedSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Get") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Get") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbUnannotatedSimpleMessage ) @@ -319,7 +319,7 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho2(ctx conte key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -340,92 +340,92 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEcho2(ctx conte if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbUnannotatedSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v int32 - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 503 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* UnannotatedEchoServiceApiService EchoBody method receives a simple message and returns it. - * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - * @param body A simple message with many types + - @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + - @param body A simple message with many types @return ExamplepbUnannotatedSimpleMessage */ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEchoBody(ctx context.Context, body ExamplepbUnannotatedSimpleMessage) (ExamplepbUnannotatedSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Post") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Post") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbUnannotatedSimpleMessage ) @@ -465,7 +465,7 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEchoBody(ctx co key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -486,104 +486,104 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEchoBody(ctx co if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbUnannotatedSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } return localVarReturnValue, localVarHttpResponse, nil } -/* +/* UnannotatedEchoServiceApiService EchoDelete method receives a simple message and returns it. * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). * @param num Int value field * @param optional nil or *UnannotatedEchoServiceEchoDeleteOpts - Optional Parameters: * @param "Id" (optional.String) - Id represents the message identifier. - * @param "Duration" (optional.String) - - * @param "LineNum" (optional.String) - - * @param "Lang" (optional.String) - - * @param "StatusProgress" (optional.String) - - * @param "StatusNote" (optional.String) - - * @param "En" (optional.String) - - * @param "NoProgress" (optional.String) - - * @param "NoNote" (optional.String) - + * @param "Duration" (optional.String) - + * @param "LineNum" (optional.String) - + * @param "Lang" (optional.String) - + * @param "StatusProgress" (optional.String) - + * @param "StatusNote" (optional.String) - + * @param "En" (optional.String) - + * @param "NoProgress" (optional.String) - + * @param "NoNote" (optional.String) - @return ExamplepbUnannotatedSimpleMessage */ -type UnannotatedEchoServiceEchoDeleteOpts struct { - Id optional.String - Duration optional.String - LineNum optional.String - Lang optional.String +type UnannotatedEchoServiceEchoDeleteOpts struct { + Id optional.String + Duration optional.String + LineNum optional.String + Lang optional.String StatusProgress optional.String - StatusNote optional.String - En optional.String - NoProgress optional.String - NoNote optional.String + StatusNote optional.String + En optional.String + NoProgress optional.String + NoNote optional.String } func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEchoDelete(ctx context.Context, num string, localVarOptionals *UnannotatedEchoServiceEchoDeleteOpts) (ExamplepbUnannotatedSimpleMessage, *http.Response, error) { var ( - localVarHttpMethod = strings.ToUpper("Delete") - localVarPostBody interface{} - localVarFileName string - localVarFileBytes []byte + localVarHttpMethod = strings.ToUpper("Delete") + localVarPostBody any + localVarFileName string + localVarFileBytes []byte localVarReturnValue ExamplepbUnannotatedSimpleMessage ) @@ -649,7 +649,7 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEchoDelete(ctx key = auth.Key } localVarHeaderParams["X-API-Key"] = key - + } } r, err := a.client.prepareRequest(ctx, localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes) @@ -670,62 +670,62 @@ func (a *UnannotatedEchoServiceApiService) UnannotatedEchoServiceEchoDelete(ctx if localVarHttpResponse.StatusCode < 300 { // If we succeed, return the data, otherwise pass on to decode error. - err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err == nil { + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err == nil { return localVarReturnValue, localVarHttpResponse, err } } if localVarHttpResponse.StatusCode >= 300 { newErr := GenericSwaggerError{ - body: localVarBody, + body: localVarBody, error: localVarHttpResponse.Status, } - + if localVarHttpResponse.StatusCode == 200 { var v ExamplepbUnannotatedSimpleMessage - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 403 { - var v interface{} - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + var v any + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 404 { var v string - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + if localVarHttpResponse.StatusCode == 0 { var v RpcStatus - err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")); - if err != nil { - newErr.error = err.Error() - return localVarReturnValue, localVarHttpResponse, newErr - } - newErr.model = v + err = a.client.decode(&v, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() return localVarReturnValue, localVarHttpResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHttpResponse, newErr } - + return localVarReturnValue, localVarHttpResponse, newErr } diff --git a/examples/internal/clients/unannotatedecho/client.go b/examples/internal/clients/unannotatedecho/client.go index 80ae202..e66a874 100644 --- a/examples/internal/clients/unannotatedecho/client.go +++ b/examples/internal/clients/unannotatedecho/client.go @@ -109,7 +109,7 @@ func contains(haystack []string, needle string) bool { } // Verify optional parameters are of the correct type. -func typeCheckParameter(obj interface{}, expected string, name string) error { +func typeCheckParameter(obj any, expected string, name string) error { // Make sure there is an object. if obj == nil { return nil @@ -123,7 +123,7 @@ func typeCheckParameter(obj interface{}, expected string, name string) error { } // parameterToString convert interface{} parameters to string, using a delimiter if format is provided. -func parameterToString(obj interface{}, collectionFormat string) string { +func parameterToString(obj any, collectionFormat string) string { var delimiter string switch collectionFormat { @@ -158,7 +158,7 @@ func (c *APIClient) ChangeBasePath(path string) { func (c *APIClient) prepareRequest( ctx context.Context, path string, method string, - postBody interface{}, + postBody any, headerParams map[string]string, queryParams url.Values, formParams url.Values, @@ -300,18 +300,18 @@ func (c *APIClient) prepareRequest( return localVarRequest, nil } -func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err error) { - if strings.Contains(contentType, "application/xml") { - if err = xml.Unmarshal(b, v); err != nil { - return err - } - return nil - } else if strings.Contains(contentType, "application/json") { - if err = json.Unmarshal(b, v); err != nil { - return err - } - return nil +func (c *APIClient) decode(v any, b []byte, contentType string) (err error) { + if strings.Contains(contentType, "application/xml") { + if err = xml.Unmarshal(b, v); err != nil { + return err + } + return nil + } else if strings.Contains(contentType, "application/json") { + if err = json.Unmarshal(b, v); err != nil { + return err } + return nil + } return errors.New("undefined response type") } @@ -333,12 +333,12 @@ func addFile(w *multipart.Writer, fieldName, path string) error { } // Prevent trying to import "fmt" -func reportError(format string, a ...interface{}) error { +func reportError(format string, a ...any) error { return fmt.Errorf(format, a...) } // Set request body from an interface{} -func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) { +func setBody(body any, contentType string) (bodyBuf *bytes.Buffer, err error) { if bodyBuf == nil { bodyBuf = &bytes.Buffer{} } @@ -369,7 +369,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e } // detectContentType method is used to figure out `Request.Body` content type for request header -func detectContentType(body interface{}) string { +func detectContentType(body any) string { contentType := "text/plain; charset=utf-8" kind := reflect.TypeOf(body).Kind() @@ -446,7 +446,7 @@ func strlen(s string) int { type GenericSwaggerError struct { body []byte error string - model interface{} + model any } // Error returns non-empty string if there was an error. @@ -460,6 +460,6 @@ func (e GenericSwaggerError) Body() []byte { } // Model returns the unpacked model of the error -func (e GenericSwaggerError) Model() interface{} { +func (e GenericSwaggerError) Model() any { return e.model -} \ No newline at end of file +} diff --git a/examples/internal/helloworld/helloworld.pb.go b/examples/internal/helloworld/helloworld.pb.go index 998896d..378b87b 100644 --- a/examples/internal/helloworld/helloworld.pb.go +++ b/examples/internal/helloworld/helloworld.pb.go @@ -284,7 +284,7 @@ func file_examples_internal_helloworld_helloworld_proto_rawDescGZIP() []byte { } var file_examples_internal_helloworld_helloworld_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_examples_internal_helloworld_helloworld_proto_goTypes = []interface{}{ +var file_examples_internal_helloworld_helloworld_proto_goTypes = []any{ (*HelloRequest)(nil), // 0: grpc.gateway.examples.internal.helloworld.HelloRequest (*HelloReply)(nil), // 1: grpc.gateway.examples.internal.helloworld.HelloReply (*wrapperspb.StringValue)(nil), // 2: google.protobuf.StringValue @@ -322,7 +322,7 @@ func file_examples_internal_helloworld_helloworld_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_examples_internal_helloworld_helloworld_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_helloworld_helloworld_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*HelloRequest); i { case 0: return &v.state @@ -334,7 +334,7 @@ func file_examples_internal_helloworld_helloworld_proto_init() { return nil } } - file_examples_internal_helloworld_helloworld_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_helloworld_helloworld_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*HelloReply); i { case 0: return &v.state diff --git a/examples/internal/helloworld/helloworld_grpc.pb.go b/examples/internal/helloworld/helloworld_grpc.pb.go index e2604a3..0f8246a 100644 --- a/examples/internal/helloworld/helloworld_grpc.pb.go +++ b/examples/internal/helloworld/helloworld_grpc.pb.go @@ -64,7 +64,7 @@ func RegisterGreeterServer(s grpc.ServiceRegistrar, srv GreeterServer) { s.RegisterService(&Greeter_ServiceDesc, srv) } -func _Greeter_SayHello_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _Greeter_SayHello_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(HelloRequest) if err := dec(in); err != nil { return nil, err @@ -76,7 +76,7 @@ func _Greeter_SayHello_Handler(srv interface{}, ctx context.Context, dec func(in Server: srv, FullMethod: "/grpc.gateway.examples.internal.helloworld.Greeter/SayHello", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(GreeterServer).SayHello(ctx, req.(*HelloRequest)) } return interceptor(ctx, in, info, handler) diff --git a/examples/internal/integration/integration_test.go b/examples/internal/integration/integration_test.go index 480deff..da14189 100644 --- a/examples/internal/integration/integration_test.go +++ b/examples/internal/integration/integration_test.go @@ -1044,7 +1044,7 @@ func TestABEPatchBody(t *testing.T) { // mustMarshal marshals the given object into a json string, calling t.Fatal if an error occurs. Useful in testing to // inline marshalling whenever you don't expect the marshalling to return an error -func mustMarshal(t *testing.T, i interface{}) string { +func mustMarshal(t *testing.T, i any) string { b, err := marshaler.Marshal(i) if err != nil { t.Fatalf("failed to marshal %#v: %v", i, err) @@ -1186,8 +1186,8 @@ func testABEList(t *testing.T, port int) { var i int for i = 0; ; i++ { var item struct { - Result json.RawMessage `json:"result"` - Error map[string]interface{} `json:"error"` + Result json.RawMessage `json:"result"` + Error map[string]any `json:"error"` } err := dec.Decode(&item) if err == io.EOF { @@ -1299,8 +1299,8 @@ func testABEBulkEcho(t *testing.T, port int) { dec := marshaler.NewDecoder(resp.Body) for i := 0; ; i++ { var item struct { - Result json.RawMessage `json:"result"` - Error map[string]interface{} `json:"error"` + Result json.RawMessage `json:"result"` + Error map[string]any `json:"error"` } err := dec.Decode(&item) if err == io.EOF { @@ -1348,8 +1348,8 @@ func testABEBulkEchoZeroLength(t *testing.T, port int) { dec := marshaler.NewDecoder(resp.Body) var item struct { - Result json.RawMessage `json:"result"` - Error map[string]interface{} `json:"error"` + Result json.RawMessage `json:"result"` + Error map[string]any `json:"error"` } if err := dec.Decode(&item); err == nil { t.Errorf("dec.Decode(&item) succeeded; want io.EOF; item = %#v", item) diff --git a/examples/internal/proto/examplepb/a_bit_of_everything.pb.go b/examples/internal/proto/examplepb/a_bit_of_everything.pb.go index ffc3907..a9409cf 100644 --- a/examples/internal/proto/examplepb/a_bit_of_everything.pb.go +++ b/examples/internal/proto/examplepb/a_bit_of_everything.pb.go @@ -2586,7 +2586,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_rawDescGZI var file_examples_internal_proto_examplepb_a_bit_of_everything_proto_enumTypes = make([]protoimpl.EnumInfo, 4) var file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes = make([]protoimpl.MessageInfo, 17) -var file_examples_internal_proto_examplepb_a_bit_of_everything_proto_goTypes = []interface{}{ +var file_examples_internal_proto_examplepb_a_bit_of_everything_proto_goTypes = []any{ (NumericEnum)(0), // 0: grpc.gateway.examples.internal.proto.examplepb.NumericEnum (SnakeCaseEnum)(0), // 1: grpc.gateway.examples.internal.proto.examplepb.snake_case_enum (SnakeCase_0Enum)(0), // 2: grpc.gateway.examples.internal.proto.examplepb.snake_case_0_enum @@ -2734,7 +2734,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ErrorResponse); i { case 0: return &v.state @@ -2746,7 +2746,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { return nil } } - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ErrorObject); i { case 0: return &v.state @@ -2758,7 +2758,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { return nil } } - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ABitOfEverything); i { case 0: return &v.state @@ -2770,7 +2770,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { return nil } } - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ABitOfEverythingRepeated); i { case 0: return &v.state @@ -2782,7 +2782,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { return nil } } - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*CheckStatusResponse); i { case 0: return &v.state @@ -2794,7 +2794,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { return nil } } - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*Body); i { case 0: return &v.state @@ -2806,7 +2806,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { return nil } } - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*MessageWithBody); i { case 0: return &v.state @@ -2818,7 +2818,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { return nil } } - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*UpdateV2Request); i { case 0: return &v.state @@ -2830,7 +2830,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { return nil } } - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*Book); i { case 0: return &v.state @@ -2842,7 +2842,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { return nil } } - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*CreateBookRequest); i { case 0: return &v.state @@ -2854,7 +2854,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { return nil } } - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*UpdateBookRequest); i { case 0: return &v.state @@ -2866,7 +2866,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { return nil } } - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*SnakeEnumRequest); i { case 0: return &v.state @@ -2878,7 +2878,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { return nil } } - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*SnakeEnumResponse); i { case 0: return &v.state @@ -2890,7 +2890,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { return nil } } - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*ABitOfEverything_Nested); i { case 0: return &v.state @@ -2903,7 +2903,7 @@ func file_examples_internal_proto_examplepb_a_bit_of_everything_proto_init() { } } } - file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[2].OneofWrappers = []interface{}{ + file_examples_internal_proto_examplepb_a_bit_of_everything_proto_msgTypes[2].OneofWrappers = []any{ (*ABitOfEverything_OneofEmpty)(nil), (*ABitOfEverything_OneofString)(nil), } diff --git a/examples/internal/proto/examplepb/a_bit_of_everything_grpc.pb.go b/examples/internal/proto/examplepb/a_bit_of_everything_grpc.pb.go index 4227137..b89d342 100644 --- a/examples/internal/proto/examplepb/a_bit_of_everything_grpc.pb.go +++ b/examples/internal/proto/examplepb/a_bit_of_everything_grpc.pb.go @@ -499,7 +499,7 @@ func RegisterABitOfEverythingServiceServer(s grpc.ServiceRegistrar, srv ABitOfEv s.RegisterService(&ABitOfEverythingService_ServiceDesc, srv) } -func _ABitOfEverythingService_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_Create_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ABitOfEverything) if err := dec(in); err != nil { return nil, err @@ -511,13 +511,13 @@ func _ABitOfEverythingService_Create_Handler(srv interface{}, ctx context.Contex Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/Create", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).Create(ctx, req.(*ABitOfEverything)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_CreateBody_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_CreateBody_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ABitOfEverything) if err := dec(in); err != nil { return nil, err @@ -529,13 +529,13 @@ func _ABitOfEverythingService_CreateBody_Handler(srv interface{}, ctx context.Co Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/CreateBody", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).CreateBody(ctx, req.(*ABitOfEverything)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_CreateBook_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_CreateBook_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(CreateBookRequest) if err := dec(in); err != nil { return nil, err @@ -547,13 +547,13 @@ func _ABitOfEverythingService_CreateBook_Handler(srv interface{}, ctx context.Co Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/CreateBook", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).CreateBook(ctx, req.(*CreateBookRequest)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_UpdateBook_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_UpdateBook_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(UpdateBookRequest) if err := dec(in); err != nil { return nil, err @@ -565,13 +565,13 @@ func _ABitOfEverythingService_UpdateBook_Handler(srv interface{}, ctx context.Co Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/UpdateBook", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).UpdateBook(ctx, req.(*UpdateBookRequest)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_Lookup_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_Lookup_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(sub2.IdMessage) if err := dec(in); err != nil { return nil, err @@ -583,13 +583,13 @@ func _ABitOfEverythingService_Lookup_Handler(srv interface{}, ctx context.Contex Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/Lookup", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).Lookup(ctx, req.(*sub2.IdMessage)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_Custom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_Custom_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ABitOfEverything) if err := dec(in); err != nil { return nil, err @@ -601,13 +601,13 @@ func _ABitOfEverythingService_Custom_Handler(srv interface{}, ctx context.Contex Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/Custom", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).Custom(ctx, req.(*ABitOfEverything)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_DoubleColon_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_DoubleColon_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ABitOfEverything) if err := dec(in); err != nil { return nil, err @@ -619,13 +619,13 @@ func _ABitOfEverythingService_DoubleColon_Handler(srv interface{}, ctx context.C Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/DoubleColon", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).DoubleColon(ctx, req.(*ABitOfEverything)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_Update_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ABitOfEverything) if err := dec(in); err != nil { return nil, err @@ -637,13 +637,13 @@ func _ABitOfEverythingService_Update_Handler(srv interface{}, ctx context.Contex Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/Update", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).Update(ctx, req.(*ABitOfEverything)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_UpdateV2_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_UpdateV2_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(UpdateV2Request) if err := dec(in); err != nil { return nil, err @@ -655,13 +655,13 @@ func _ABitOfEverythingService_UpdateV2_Handler(srv interface{}, ctx context.Cont Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/UpdateV2", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).UpdateV2(ctx, req.(*UpdateV2Request)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_Delete_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(sub2.IdMessage) if err := dec(in); err != nil { return nil, err @@ -673,13 +673,13 @@ func _ABitOfEverythingService_Delete_Handler(srv interface{}, ctx context.Contex Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/Delete", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).Delete(ctx, req.(*sub2.IdMessage)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_GetQuery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_GetQuery_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ABitOfEverything) if err := dec(in); err != nil { return nil, err @@ -691,13 +691,13 @@ func _ABitOfEverythingService_GetQuery_Handler(srv interface{}, ctx context.Cont Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/GetQuery", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).GetQuery(ctx, req.(*ABitOfEverything)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_GetRepeatedQuery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_GetRepeatedQuery_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ABitOfEverythingRepeated) if err := dec(in); err != nil { return nil, err @@ -709,13 +709,13 @@ func _ABitOfEverythingService_GetRepeatedQuery_Handler(srv interface{}, ctx cont Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/GetRepeatedQuery", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).GetRepeatedQuery(ctx, req.(*ABitOfEverythingRepeated)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_Echo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_Echo_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(sub.StringMessage) if err := dec(in); err != nil { return nil, err @@ -727,13 +727,13 @@ func _ABitOfEverythingService_Echo_Handler(srv interface{}, ctx context.Context, Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/Echo", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).Echo(ctx, req.(*sub.StringMessage)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_DeepPathEcho_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_DeepPathEcho_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ABitOfEverything) if err := dec(in); err != nil { return nil, err @@ -745,13 +745,13 @@ func _ABitOfEverythingService_DeepPathEcho_Handler(srv interface{}, ctx context. Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/DeepPathEcho", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).DeepPathEcho(ctx, req.(*ABitOfEverything)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_NoBindings_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_NoBindings_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(durationpb.Duration) if err := dec(in); err != nil { return nil, err @@ -763,13 +763,13 @@ func _ABitOfEverythingService_NoBindings_Handler(srv interface{}, ctx context.Co Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/NoBindings", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).NoBindings(ctx, req.(*durationpb.Duration)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_Timeout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_Timeout_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err @@ -781,13 +781,13 @@ func _ABitOfEverythingService_Timeout_Handler(srv interface{}, ctx context.Conte Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/Timeout", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).Timeout(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_ErrorWithDetails_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_ErrorWithDetails_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err @@ -799,13 +799,13 @@ func _ABitOfEverythingService_ErrorWithDetails_Handler(srv interface{}, ctx cont Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/ErrorWithDetails", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).ErrorWithDetails(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_GetMessageWithBody_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_GetMessageWithBody_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(MessageWithBody) if err := dec(in); err != nil { return nil, err @@ -817,13 +817,13 @@ func _ABitOfEverythingService_GetMessageWithBody_Handler(srv interface{}, ctx co Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/GetMessageWithBody", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).GetMessageWithBody(ctx, req.(*MessageWithBody)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_PostWithEmptyBody_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_PostWithEmptyBody_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(Body) if err := dec(in); err != nil { return nil, err @@ -835,13 +835,13 @@ func _ABitOfEverythingService_PostWithEmptyBody_Handler(srv interface{}, ctx con Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/PostWithEmptyBody", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).PostWithEmptyBody(ctx, req.(*Body)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_CheckGetQueryParams_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_CheckGetQueryParams_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ABitOfEverything) if err := dec(in); err != nil { return nil, err @@ -853,13 +853,13 @@ func _ABitOfEverythingService_CheckGetQueryParams_Handler(srv interface{}, ctx c Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/CheckGetQueryParams", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).CheckGetQueryParams(ctx, req.(*ABitOfEverything)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_CheckNestedEnumGetQueryParams_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_CheckNestedEnumGetQueryParams_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ABitOfEverything) if err := dec(in); err != nil { return nil, err @@ -871,13 +871,13 @@ func _ABitOfEverythingService_CheckNestedEnumGetQueryParams_Handler(srv interfac Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/CheckNestedEnumGetQueryParams", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).CheckNestedEnumGetQueryParams(ctx, req.(*ABitOfEverything)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_CheckPostQueryParams_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_CheckPostQueryParams_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ABitOfEverything) if err := dec(in); err != nil { return nil, err @@ -889,13 +889,13 @@ func _ABitOfEverythingService_CheckPostQueryParams_Handler(srv interface{}, ctx Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/CheckPostQueryParams", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).CheckPostQueryParams(ctx, req.(*ABitOfEverything)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_OverwriteResponseContentType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_OverwriteResponseContentType_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err @@ -907,13 +907,13 @@ func _ABitOfEverythingService_OverwriteResponseContentType_Handler(srv interface Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/OverwriteResponseContentType", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).OverwriteResponseContentType(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_CheckExternalPathEnum_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_CheckExternalPathEnum_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(pathenum.MessageWithPathEnum) if err := dec(in); err != nil { return nil, err @@ -925,13 +925,13 @@ func _ABitOfEverythingService_CheckExternalPathEnum_Handler(srv interface{}, ctx Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/CheckExternalPathEnum", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).CheckExternalPathEnum(ctx, req.(*pathenum.MessageWithPathEnum)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_CheckExternalNestedPathEnum_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_CheckExternalNestedPathEnum_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(pathenum.MessageWithNestedPathEnum) if err := dec(in); err != nil { return nil, err @@ -943,13 +943,13 @@ func _ABitOfEverythingService_CheckExternalNestedPathEnum_Handler(srv interface{ Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/CheckExternalNestedPathEnum", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).CheckExternalNestedPathEnum(ctx, req.(*pathenum.MessageWithNestedPathEnum)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_CheckStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_CheckStatus_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err @@ -961,13 +961,13 @@ func _ABitOfEverythingService_CheckStatus_Handler(srv interface{}, ctx context.C Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/CheckStatus", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).CheckStatus(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_Exists_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_Exists_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ABitOfEverything) if err := dec(in); err != nil { return nil, err @@ -979,13 +979,13 @@ func _ABitOfEverythingService_Exists_Handler(srv interface{}, ctx context.Contex Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/Exists", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).Exists(ctx, req.(*ABitOfEverything)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_CustomOptionsRequest_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_CustomOptionsRequest_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ABitOfEverything) if err := dec(in); err != nil { return nil, err @@ -997,13 +997,13 @@ func _ABitOfEverythingService_CustomOptionsRequest_Handler(srv interface{}, ctx Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/CustomOptionsRequest", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).CustomOptionsRequest(ctx, req.(*ABitOfEverything)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_TraceRequest_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_TraceRequest_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ABitOfEverything) if err := dec(in); err != nil { return nil, err @@ -1015,13 +1015,13 @@ func _ABitOfEverythingService_TraceRequest_Handler(srv interface{}, ctx context. Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/TraceRequest", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).TraceRequest(ctx, req.(*ABitOfEverything)) } return interceptor(ctx, in, info, handler) } -func _ABitOfEverythingService_PostOneofEnum_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABitOfEverythingService_PostOneofEnum_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(oneofenum.OneofEnumMessage) if err := dec(in); err != nil { return nil, err @@ -1033,7 +1033,7 @@ func _ABitOfEverythingService_PostOneofEnum_Handler(srv interface{}, ctx context Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ABitOfEverythingService/PostOneofEnum", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ABitOfEverythingServiceServer).PostOneofEnum(ctx, req.(*oneofenum.OneofEnumMessage)) } return interceptor(ctx, in, info, handler) @@ -1221,7 +1221,7 @@ func RegisterCamelCaseServiceNameServer(s grpc.ServiceRegistrar, srv CamelCaseSe s.RegisterService(&CamelCaseServiceName_ServiceDesc, srv) } -func _CamelCaseServiceName_Empty_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _CamelCaseServiceName_Empty_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err @@ -1233,7 +1233,7 @@ func _CamelCaseServiceName_Empty_Handler(srv interface{}, ctx context.Context, d Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.camelCaseServiceName/Empty", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(CamelCaseServiceNameServer).Empty(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) @@ -1305,7 +1305,7 @@ func RegisterAnotherServiceWithNoBindingsServer(s grpc.ServiceRegistrar, srv Ano s.RegisterService(&AnotherServiceWithNoBindings_ServiceDesc, srv) } -func _AnotherServiceWithNoBindings_NoBindings_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _AnotherServiceWithNoBindings_NoBindings_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err @@ -1317,7 +1317,7 @@ func _AnotherServiceWithNoBindings_NoBindings_Handler(srv interface{}, ctx conte Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.AnotherServiceWithNoBindings/NoBindings", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(AnotherServiceWithNoBindingsServer).NoBindings(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) @@ -1389,7 +1389,7 @@ func RegisterSnakeEnumServiceServer(s grpc.ServiceRegistrar, srv SnakeEnumServic s.RegisterService(&SnakeEnumService_ServiceDesc, srv) } -func _SnakeEnumService_SnakeEnum_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _SnakeEnumService_SnakeEnum_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(SnakeEnumRequest) if err := dec(in); err != nil { return nil, err @@ -1401,7 +1401,7 @@ func _SnakeEnumService_SnakeEnum_Handler(srv interface{}, ctx context.Context, d Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.SnakeEnumService/SnakeEnum", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(SnakeEnumServiceServer).SnakeEnum(ctx, req.(*SnakeEnumRequest)) } return interceptor(ctx, in, info, handler) diff --git a/examples/internal/proto/examplepb/echo_service.pb.go b/examples/internal/proto/examplepb/echo_service.pb.go index abfd526..709c9e2 100644 --- a/examples/internal/proto/examplepb/echo_service.pb.go +++ b/examples/internal/proto/examplepb/echo_service.pb.go @@ -515,7 +515,7 @@ func file_examples_internal_proto_examplepb_echo_service_proto_rawDescGZIP() []b } var file_examples_internal_proto_examplepb_echo_service_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_examples_internal_proto_examplepb_echo_service_proto_goTypes = []interface{}{ +var file_examples_internal_proto_examplepb_echo_service_proto_goTypes = []any{ (*Embedded)(nil), // 0: grpc.gateway.examples.internal.proto.examplepb.Embedded (*SimpleMessage)(nil), // 1: grpc.gateway.examples.internal.proto.examplepb.SimpleMessage (*DynamicMessage)(nil), // 2: grpc.gateway.examples.internal.proto.examplepb.DynamicMessage @@ -554,7 +554,7 @@ func file_examples_internal_proto_examplepb_echo_service_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_examplepb_echo_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_echo_service_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*Embedded); i { case 0: return &v.state @@ -566,7 +566,7 @@ func file_examples_internal_proto_examplepb_echo_service_proto_init() { return nil } } - file_examples_internal_proto_examplepb_echo_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_echo_service_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*SimpleMessage); i { case 0: return &v.state @@ -578,7 +578,7 @@ func file_examples_internal_proto_examplepb_echo_service_proto_init() { return nil } } - file_examples_internal_proto_examplepb_echo_service_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_echo_service_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*DynamicMessage); i { case 0: return &v.state @@ -590,7 +590,7 @@ func file_examples_internal_proto_examplepb_echo_service_proto_init() { return nil } } - file_examples_internal_proto_examplepb_echo_service_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_echo_service_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*DynamicMessageUpdate); i { case 0: return &v.state @@ -603,11 +603,11 @@ func file_examples_internal_proto_examplepb_echo_service_proto_init() { } } } - file_examples_internal_proto_examplepb_echo_service_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_examples_internal_proto_examplepb_echo_service_proto_msgTypes[0].OneofWrappers = []any{ (*Embedded_Progress)(nil), (*Embedded_Note)(nil), } - file_examples_internal_proto_examplepb_echo_service_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_examples_internal_proto_examplepb_echo_service_proto_msgTypes[1].OneofWrappers = []any{ (*SimpleMessage_LineNum)(nil), (*SimpleMessage_Lang)(nil), (*SimpleMessage_En)(nil), diff --git a/examples/internal/proto/examplepb/echo_service_grpc.pb.go b/examples/internal/proto/examplepb/echo_service_grpc.pb.go index fe72dad..4da8d9c 100644 --- a/examples/internal/proto/examplepb/echo_service_grpc.pb.go +++ b/examples/internal/proto/examplepb/echo_service_grpc.pb.go @@ -140,7 +140,7 @@ func RegisterEchoServiceServer(s grpc.ServiceRegistrar, srv EchoServiceServer) { s.RegisterService(&EchoService_ServiceDesc, srv) } -func _EchoService_Echo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _EchoService_Echo_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(SimpleMessage) if err := dec(in); err != nil { return nil, err @@ -152,13 +152,13 @@ func _EchoService_Echo_Handler(srv interface{}, ctx context.Context, dec func(in Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.EchoService/Echo", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(EchoServiceServer).Echo(ctx, req.(*SimpleMessage)) } return interceptor(ctx, in, info, handler) } -func _EchoService_EchoBody_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _EchoService_EchoBody_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(SimpleMessage) if err := dec(in); err != nil { return nil, err @@ -170,13 +170,13 @@ func _EchoService_EchoBody_Handler(srv interface{}, ctx context.Context, dec fun Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.EchoService/EchoBody", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(EchoServiceServer).EchoBody(ctx, req.(*SimpleMessage)) } return interceptor(ctx, in, info, handler) } -func _EchoService_EchoDelete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _EchoService_EchoDelete_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(SimpleMessage) if err := dec(in); err != nil { return nil, err @@ -188,13 +188,13 @@ func _EchoService_EchoDelete_Handler(srv interface{}, ctx context.Context, dec f Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.EchoService/EchoDelete", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(EchoServiceServer).EchoDelete(ctx, req.(*SimpleMessage)) } return interceptor(ctx, in, info, handler) } -func _EchoService_EchoPatch_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _EchoService_EchoPatch_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(DynamicMessageUpdate) if err := dec(in); err != nil { return nil, err @@ -206,13 +206,13 @@ func _EchoService_EchoPatch_Handler(srv interface{}, ctx context.Context, dec fu Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.EchoService/EchoPatch", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(EchoServiceServer).EchoPatch(ctx, req.(*DynamicMessageUpdate)) } return interceptor(ctx, in, info, handler) } -func _EchoService_EchoUnauthorized_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _EchoService_EchoUnauthorized_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(SimpleMessage) if err := dec(in); err != nil { return nil, err @@ -224,7 +224,7 @@ func _EchoService_EchoUnauthorized_Handler(srv interface{}, ctx context.Context, Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.EchoService/EchoUnauthorized", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(EchoServiceServer).EchoUnauthorized(ctx, req.(*SimpleMessage)) } return interceptor(ctx, in, info, handler) diff --git a/examples/internal/proto/examplepb/flow_combination.pb.go b/examples/internal/proto/examplepb/flow_combination.pb.go index 60e754b..2c99c2e 100644 --- a/examples/internal/proto/examplepb/flow_combination.pb.go +++ b/examples/internal/proto/examplepb/flow_combination.pb.go @@ -475,7 +475,7 @@ func file_examples_internal_proto_examplepb_flow_combination_proto_rawDescGZIP() } var file_examples_internal_proto_examplepb_flow_combination_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_examples_internal_proto_examplepb_flow_combination_proto_goTypes = []interface{}{ +var file_examples_internal_proto_examplepb_flow_combination_proto_goTypes = []any{ (*EmptyProto)(nil), // 0: grpc.gateway.examples.internal.proto.examplepb.EmptyProto (*NonEmptyProto)(nil), // 1: grpc.gateway.examples.internal.proto.examplepb.NonEmptyProto (*UnaryProto)(nil), // 2: grpc.gateway.examples.internal.proto.examplepb.UnaryProto @@ -518,7 +518,7 @@ func file_examples_internal_proto_examplepb_flow_combination_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_examplepb_flow_combination_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_flow_combination_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*EmptyProto); i { case 0: return &v.state @@ -530,7 +530,7 @@ func file_examples_internal_proto_examplepb_flow_combination_proto_init() { return nil } } - file_examples_internal_proto_examplepb_flow_combination_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_flow_combination_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*NonEmptyProto); i { case 0: return &v.state @@ -542,7 +542,7 @@ func file_examples_internal_proto_examplepb_flow_combination_proto_init() { return nil } } - file_examples_internal_proto_examplepb_flow_combination_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_flow_combination_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*UnaryProto); i { case 0: return &v.state @@ -554,7 +554,7 @@ func file_examples_internal_proto_examplepb_flow_combination_proto_init() { return nil } } - file_examples_internal_proto_examplepb_flow_combination_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_flow_combination_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*NestedProto); i { case 0: return &v.state @@ -566,7 +566,7 @@ func file_examples_internal_proto_examplepb_flow_combination_proto_init() { return nil } } - file_examples_internal_proto_examplepb_flow_combination_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_flow_combination_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*SingleNestedProto); i { case 0: return &v.state diff --git a/examples/internal/proto/examplepb/flow_combination_grpc.pb.go b/examples/internal/proto/examplepb/flow_combination_grpc.pb.go index e1bb90a..b9918f2 100644 --- a/examples/internal/proto/examplepb/flow_combination_grpc.pb.go +++ b/examples/internal/proto/examplepb/flow_combination_grpc.pb.go @@ -329,7 +329,7 @@ func RegisterFlowCombinationServer(s grpc.ServiceRegistrar, srv FlowCombinationS s.RegisterService(&FlowCombination_ServiceDesc, srv) } -func _FlowCombination_RpcEmptyRpc_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _FlowCombination_RpcEmptyRpc_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(EmptyProto) if err := dec(in); err != nil { return nil, err @@ -341,13 +341,13 @@ func _FlowCombination_RpcEmptyRpc_Handler(srv interface{}, ctx context.Context, Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.FlowCombination/RpcEmptyRpc", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(FlowCombinationServer).RpcEmptyRpc(ctx, req.(*EmptyProto)) } return interceptor(ctx, in, info, handler) } -func _FlowCombination_RpcEmptyStream_Handler(srv interface{}, stream grpc.ServerStream) error { +func _FlowCombination_RpcEmptyStream_Handler(srv any, stream grpc.ServerStream) error { m := new(EmptyProto) if err := stream.RecvMsg(m); err != nil { return err @@ -368,7 +368,7 @@ func (x *flowCombinationRpcEmptyStreamServer) Send(m *EmptyProto) error { return x.ServerStream.SendMsg(m) } -func _FlowCombination_StreamEmptyRpc_Handler(srv interface{}, stream grpc.ServerStream) error { +func _FlowCombination_StreamEmptyRpc_Handler(srv any, stream grpc.ServerStream) error { return srv.(FlowCombinationServer).StreamEmptyRpc(&flowCombinationStreamEmptyRpcServer{stream}) } @@ -394,7 +394,7 @@ func (x *flowCombinationStreamEmptyRpcServer) Recv() (*EmptyProto, error) { return m, nil } -func _FlowCombination_StreamEmptyStream_Handler(srv interface{}, stream grpc.ServerStream) error { +func _FlowCombination_StreamEmptyStream_Handler(srv any, stream grpc.ServerStream) error { return srv.(FlowCombinationServer).StreamEmptyStream(&flowCombinationStreamEmptyStreamServer{stream}) } @@ -420,7 +420,7 @@ func (x *flowCombinationStreamEmptyStreamServer) Recv() (*EmptyProto, error) { return m, nil } -func _FlowCombination_RpcBodyRpc_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _FlowCombination_RpcBodyRpc_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(NonEmptyProto) if err := dec(in); err != nil { return nil, err @@ -432,13 +432,13 @@ func _FlowCombination_RpcBodyRpc_Handler(srv interface{}, ctx context.Context, d Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.FlowCombination/RpcBodyRpc", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(FlowCombinationServer).RpcBodyRpc(ctx, req.(*NonEmptyProto)) } return interceptor(ctx, in, info, handler) } -func _FlowCombination_RpcPathSingleNestedRpc_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _FlowCombination_RpcPathSingleNestedRpc_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(SingleNestedProto) if err := dec(in); err != nil { return nil, err @@ -450,13 +450,13 @@ func _FlowCombination_RpcPathSingleNestedRpc_Handler(srv interface{}, ctx contex Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.FlowCombination/RpcPathSingleNestedRpc", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(FlowCombinationServer).RpcPathSingleNestedRpc(ctx, req.(*SingleNestedProto)) } return interceptor(ctx, in, info, handler) } -func _FlowCombination_RpcPathNestedRpc_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _FlowCombination_RpcPathNestedRpc_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(NestedProto) if err := dec(in); err != nil { return nil, err @@ -468,13 +468,13 @@ func _FlowCombination_RpcPathNestedRpc_Handler(srv interface{}, ctx context.Cont Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.FlowCombination/RpcPathNestedRpc", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(FlowCombinationServer).RpcPathNestedRpc(ctx, req.(*NestedProto)) } return interceptor(ctx, in, info, handler) } -func _FlowCombination_RpcBodyStream_Handler(srv interface{}, stream grpc.ServerStream) error { +func _FlowCombination_RpcBodyStream_Handler(srv any, stream grpc.ServerStream) error { m := new(NonEmptyProto) if err := stream.RecvMsg(m); err != nil { return err @@ -495,7 +495,7 @@ func (x *flowCombinationRpcBodyStreamServer) Send(m *EmptyProto) error { return x.ServerStream.SendMsg(m) } -func _FlowCombination_RpcPathSingleNestedStream_Handler(srv interface{}, stream grpc.ServerStream) error { +func _FlowCombination_RpcPathSingleNestedStream_Handler(srv any, stream grpc.ServerStream) error { m := new(SingleNestedProto) if err := stream.RecvMsg(m); err != nil { return err @@ -516,7 +516,7 @@ func (x *flowCombinationRpcPathSingleNestedStreamServer) Send(m *EmptyProto) err return x.ServerStream.SendMsg(m) } -func _FlowCombination_RpcPathNestedStream_Handler(srv interface{}, stream grpc.ServerStream) error { +func _FlowCombination_RpcPathNestedStream_Handler(srv any, stream grpc.ServerStream) error { m := new(NestedProto) if err := stream.RecvMsg(m); err != nil { return err diff --git a/examples/internal/proto/examplepb/generate_unbound_methods.pb.go b/examples/internal/proto/examplepb/generate_unbound_methods.pb.go index 7f75a15..7053468 100644 --- a/examples/internal/proto/examplepb/generate_unbound_methods.pb.go +++ b/examples/internal/proto/examplepb/generate_unbound_methods.pb.go @@ -170,7 +170,7 @@ func file_examples_internal_proto_examplepb_generate_unbound_methods_proto_rawDe } var file_examples_internal_proto_examplepb_generate_unbound_methods_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_examples_internal_proto_examplepb_generate_unbound_methods_proto_goTypes = []interface{}{ +var file_examples_internal_proto_examplepb_generate_unbound_methods_proto_goTypes = []any{ (*GenerateUnboundMethodsSimpleMessage)(nil), // 0: grpc.gateway.examples.internal.proto.examplepb.GenerateUnboundMethodsSimpleMessage (*durationpb.Duration)(nil), // 1: google.protobuf.Duration } @@ -195,7 +195,7 @@ func file_examples_internal_proto_examplepb_generate_unbound_methods_proto_init( return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_examplepb_generate_unbound_methods_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_generate_unbound_methods_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*GenerateUnboundMethodsSimpleMessage); i { case 0: return &v.state diff --git a/examples/internal/proto/examplepb/generate_unbound_methods_grpc.pb.go b/examples/internal/proto/examplepb/generate_unbound_methods_grpc.pb.go index 3ee17a6..12d3016 100644 --- a/examples/internal/proto/examplepb/generate_unbound_methods_grpc.pb.go +++ b/examples/internal/proto/examplepb/generate_unbound_methods_grpc.pb.go @@ -104,7 +104,7 @@ func RegisterGenerateUnboundMethodsEchoServiceServer(s grpc.ServiceRegistrar, sr s.RegisterService(&GenerateUnboundMethodsEchoService_ServiceDesc, srv) } -func _GenerateUnboundMethodsEchoService_Echo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _GenerateUnboundMethodsEchoService_Echo_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(GenerateUnboundMethodsSimpleMessage) if err := dec(in); err != nil { return nil, err @@ -116,13 +116,13 @@ func _GenerateUnboundMethodsEchoService_Echo_Handler(srv interface{}, ctx contex Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.GenerateUnboundMethodsEchoService/Echo", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(GenerateUnboundMethodsEchoServiceServer).Echo(ctx, req.(*GenerateUnboundMethodsSimpleMessage)) } return interceptor(ctx, in, info, handler) } -func _GenerateUnboundMethodsEchoService_EchoBody_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _GenerateUnboundMethodsEchoService_EchoBody_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(GenerateUnboundMethodsSimpleMessage) if err := dec(in); err != nil { return nil, err @@ -134,13 +134,13 @@ func _GenerateUnboundMethodsEchoService_EchoBody_Handler(srv interface{}, ctx co Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.GenerateUnboundMethodsEchoService/EchoBody", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(GenerateUnboundMethodsEchoServiceServer).EchoBody(ctx, req.(*GenerateUnboundMethodsSimpleMessage)) } return interceptor(ctx, in, info, handler) } -func _GenerateUnboundMethodsEchoService_EchoDelete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _GenerateUnboundMethodsEchoService_EchoDelete_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(GenerateUnboundMethodsSimpleMessage) if err := dec(in); err != nil { return nil, err @@ -152,7 +152,7 @@ func _GenerateUnboundMethodsEchoService_EchoDelete_Handler(srv interface{}, ctx Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.GenerateUnboundMethodsEchoService/EchoDelete", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(GenerateUnboundMethodsEchoServiceServer).EchoDelete(ctx, req.(*GenerateUnboundMethodsSimpleMessage)) } return interceptor(ctx, in, info, handler) diff --git a/examples/internal/proto/examplepb/non_standard_names.pb.go b/examples/internal/proto/examplepb/non_standard_names.pb.go index fa5d46f..e38d309 100644 --- a/examples/internal/proto/examplepb/non_standard_names.pb.go +++ b/examples/internal/proto/examplepb/non_standard_names.pb.go @@ -675,7 +675,7 @@ func file_examples_internal_proto_examplepb_non_standard_names_proto_rawDescGZIP } var file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_examples_internal_proto_examplepb_non_standard_names_proto_goTypes = []interface{}{ +var file_examples_internal_proto_examplepb_non_standard_names_proto_goTypes = []any{ (*NonStandardMessage)(nil), // 0: grpc.gateway.examples.internal.proto.examplepb.NonStandardMessage (*NonStandardUpdateRequest)(nil), // 1: grpc.gateway.examples.internal.proto.examplepb.NonStandardUpdateRequest (*NonStandardMessageWithJSONNames)(nil), // 2: grpc.gateway.examples.internal.proto.examplepb.NonStandardMessageWithJSONNames @@ -712,7 +712,7 @@ func file_examples_internal_proto_examplepb_non_standard_names_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*NonStandardMessage); i { case 0: return &v.state @@ -724,7 +724,7 @@ func file_examples_internal_proto_examplepb_non_standard_names_proto_init() { return nil } } - file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*NonStandardUpdateRequest); i { case 0: return &v.state @@ -736,7 +736,7 @@ func file_examples_internal_proto_examplepb_non_standard_names_proto_init() { return nil } } - file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*NonStandardMessageWithJSONNames); i { case 0: return &v.state @@ -748,7 +748,7 @@ func file_examples_internal_proto_examplepb_non_standard_names_proto_init() { return nil } } - file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*NonStandardWithJSONNamesUpdateRequest); i { case 0: return &v.state @@ -760,7 +760,7 @@ func file_examples_internal_proto_examplepb_non_standard_names_proto_init() { return nil } } - file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*NonStandardMessage_Thing); i { case 0: return &v.state @@ -772,7 +772,7 @@ func file_examples_internal_proto_examplepb_non_standard_names_proto_init() { return nil } } - file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*NonStandardMessage_Thing_SubThing); i { case 0: return &v.state @@ -784,7 +784,7 @@ func file_examples_internal_proto_examplepb_non_standard_names_proto_init() { return nil } } - file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*NonStandardMessageWithJSONNames_Thing); i { case 0: return &v.state @@ -796,7 +796,7 @@ func file_examples_internal_proto_examplepb_non_standard_names_proto_init() { return nil } } - file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_non_standard_names_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*NonStandardMessageWithJSONNames_Thing_SubThing); i { case 0: return &v.state diff --git a/examples/internal/proto/examplepb/non_standard_names_grpc.pb.go b/examples/internal/proto/examplepb/non_standard_names_grpc.pb.go index 0b561db..e09c9f1 100644 --- a/examples/internal/proto/examplepb/non_standard_names_grpc.pb.go +++ b/examples/internal/proto/examplepb/non_standard_names_grpc.pb.go @@ -82,7 +82,7 @@ func RegisterNonStandardServiceServer(s grpc.ServiceRegistrar, srv NonStandardSe s.RegisterService(&NonStandardService_ServiceDesc, srv) } -func _NonStandardService_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _NonStandardService_Update_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(NonStandardUpdateRequest) if err := dec(in); err != nil { return nil, err @@ -94,13 +94,13 @@ func _NonStandardService_Update_Handler(srv interface{}, ctx context.Context, de Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.NonStandardService/Update", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(NonStandardServiceServer).Update(ctx, req.(*NonStandardUpdateRequest)) } return interceptor(ctx, in, info, handler) } -func _NonStandardService_UpdateWithJSONNames_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _NonStandardService_UpdateWithJSONNames_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(NonStandardWithJSONNamesUpdateRequest) if err := dec(in); err != nil { return nil, err @@ -112,7 +112,7 @@ func _NonStandardService_UpdateWithJSONNames_Handler(srv interface{}, ctx contex Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.NonStandardService/UpdateWithJSONNames", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(NonStandardServiceServer).UpdateWithJSONNames(ctx, req.(*NonStandardWithJSONNamesUpdateRequest)) } return interceptor(ctx, in, info, handler) diff --git a/examples/internal/proto/examplepb/openapi_merge_a.pb.go b/examples/internal/proto/examplepb/openapi_merge_a.pb.go index fd1b30f..3cef40f 100644 --- a/examples/internal/proto/examplepb/openapi_merge_a.pb.go +++ b/examples/internal/proto/examplepb/openapi_merge_a.pb.go @@ -250,7 +250,7 @@ func file_examples_internal_proto_examplepb_openapi_merge_a_proto_rawDescGZIP() } var file_examples_internal_proto_examplepb_openapi_merge_a_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_examples_internal_proto_examplepb_openapi_merge_a_proto_goTypes = []interface{}{ +var file_examples_internal_proto_examplepb_openapi_merge_a_proto_goTypes = []any{ (*InMessageA)(nil), // 0: grpc.gateway.examples.internal.examplepb.InMessageA (*OutMessageA)(nil), // 1: grpc.gateway.examples.internal.examplepb.OutMessageA (*OutMessageC)(nil), // 2: grpc.gateway.examples.internal.examplepb.OutMessageC @@ -277,7 +277,7 @@ func file_examples_internal_proto_examplepb_openapi_merge_a_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_examplepb_openapi_merge_a_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_openapi_merge_a_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*InMessageA); i { case 0: return &v.state @@ -289,7 +289,7 @@ func file_examples_internal_proto_examplepb_openapi_merge_a_proto_init() { return nil } } - file_examples_internal_proto_examplepb_openapi_merge_a_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_openapi_merge_a_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*OutMessageA); i { case 0: return &v.state @@ -301,7 +301,7 @@ func file_examples_internal_proto_examplepb_openapi_merge_a_proto_init() { return nil } } - file_examples_internal_proto_examplepb_openapi_merge_a_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_openapi_merge_a_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*OutMessageC); i { case 0: return &v.state diff --git a/examples/internal/proto/examplepb/openapi_merge_a_grpc.pb.go b/examples/internal/proto/examplepb/openapi_merge_a_grpc.pb.go index bd17301..76ffe9a 100644 --- a/examples/internal/proto/examplepb/openapi_merge_a_grpc.pb.go +++ b/examples/internal/proto/examplepb/openapi_merge_a_grpc.pb.go @@ -90,7 +90,7 @@ func RegisterServiceAServer(s grpc.ServiceRegistrar, srv ServiceAServer) { s.RegisterService(&ServiceA_ServiceDesc, srv) } -func _ServiceA_MethodOne_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ServiceA_MethodOne_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(InMessageA) if err := dec(in); err != nil { return nil, err @@ -102,13 +102,13 @@ func _ServiceA_MethodOne_Handler(srv interface{}, ctx context.Context, dec func( Server: srv, FullMethod: "/grpc.gateway.examples.internal.examplepb.ServiceA/MethodOne", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ServiceAServer).MethodOne(ctx, req.(*InMessageA)) } return interceptor(ctx, in, info, handler) } -func _ServiceA_MethodTwo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ServiceA_MethodTwo_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(OutMessageA) if err := dec(in); err != nil { return nil, err @@ -120,7 +120,7 @@ func _ServiceA_MethodTwo_Handler(srv interface{}, ctx context.Context, dec func( Server: srv, FullMethod: "/grpc.gateway.examples.internal.examplepb.ServiceA/MethodTwo", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ServiceAServer).MethodTwo(ctx, req.(*OutMessageA)) } return interceptor(ctx, in, info, handler) @@ -222,7 +222,7 @@ func RegisterServiceCServer(s grpc.ServiceRegistrar, srv ServiceCServer) { s.RegisterService(&ServiceC_ServiceDesc, srv) } -func _ServiceC_MethodOne_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ServiceC_MethodOne_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(InMessageA) if err := dec(in); err != nil { return nil, err @@ -234,13 +234,13 @@ func _ServiceC_MethodOne_Handler(srv interface{}, ctx context.Context, dec func( Server: srv, FullMethod: "/grpc.gateway.examples.internal.examplepb.ServiceC/MethodOne", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ServiceCServer).MethodOne(ctx, req.(*InMessageA)) } return interceptor(ctx, in, info, handler) } -func _ServiceC_MethodTwo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ServiceC_MethodTwo_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(OutMessageA) if err := dec(in); err != nil { return nil, err @@ -252,7 +252,7 @@ func _ServiceC_MethodTwo_Handler(srv interface{}, ctx context.Context, dec func( Server: srv, FullMethod: "/grpc.gateway.examples.internal.examplepb.ServiceC/MethodTwo", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ServiceCServer).MethodTwo(ctx, req.(*OutMessageA)) } return interceptor(ctx, in, info, handler) diff --git a/examples/internal/proto/examplepb/openapi_merge_b.pb.go b/examples/internal/proto/examplepb/openapi_merge_b.pb.go index 07e6dda..3bc2065 100644 --- a/examples/internal/proto/examplepb/openapi_merge_b.pb.go +++ b/examples/internal/proto/examplepb/openapi_merge_b.pb.go @@ -179,7 +179,7 @@ func file_examples_internal_proto_examplepb_openapi_merge_b_proto_rawDescGZIP() } var file_examples_internal_proto_examplepb_openapi_merge_b_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_examples_internal_proto_examplepb_openapi_merge_b_proto_goTypes = []interface{}{ +var file_examples_internal_proto_examplepb_openapi_merge_b_proto_goTypes = []any{ (*InMessageB)(nil), // 0: grpc.gateway.examples.internal.examplepb.InMessageB (*OutMessageB)(nil), // 1: grpc.gateway.examples.internal.examplepb.OutMessageB } @@ -201,7 +201,7 @@ func file_examples_internal_proto_examplepb_openapi_merge_b_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_examplepb_openapi_merge_b_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_openapi_merge_b_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*InMessageB); i { case 0: return &v.state @@ -213,7 +213,7 @@ func file_examples_internal_proto_examplepb_openapi_merge_b_proto_init() { return nil } } - file_examples_internal_proto_examplepb_openapi_merge_b_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_openapi_merge_b_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*OutMessageB); i { case 0: return &v.state diff --git a/examples/internal/proto/examplepb/openapi_merge_b_grpc.pb.go b/examples/internal/proto/examplepb/openapi_merge_b_grpc.pb.go index 50db8ac..a603640 100644 --- a/examples/internal/proto/examplepb/openapi_merge_b_grpc.pb.go +++ b/examples/internal/proto/examplepb/openapi_merge_b_grpc.pb.go @@ -90,7 +90,7 @@ func RegisterServiceBServer(s grpc.ServiceRegistrar, srv ServiceBServer) { s.RegisterService(&ServiceB_ServiceDesc, srv) } -func _ServiceB_MethodOne_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ServiceB_MethodOne_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(InMessageB) if err := dec(in); err != nil { return nil, err @@ -102,13 +102,13 @@ func _ServiceB_MethodOne_Handler(srv interface{}, ctx context.Context, dec func( Server: srv, FullMethod: "/grpc.gateway.examples.internal.examplepb.ServiceB/MethodOne", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ServiceBServer).MethodOne(ctx, req.(*InMessageB)) } return interceptor(ctx, in, info, handler) } -func _ServiceB_MethodTwo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ServiceB_MethodTwo_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(OutMessageB) if err := dec(in); err != nil { return nil, err @@ -120,7 +120,7 @@ func _ServiceB_MethodTwo_Handler(srv interface{}, ctx context.Context, dec func( Server: srv, FullMethod: "/grpc.gateway.examples.internal.examplepb.ServiceB/MethodTwo", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ServiceBServer).MethodTwo(ctx, req.(*OutMessageB)) } return interceptor(ctx, in, info, handler) diff --git a/examples/internal/proto/examplepb/response_body_service.pb.go b/examples/internal/proto/examplepb/response_body_service.pb.go index c6e9e82..2c55136 100644 --- a/examples/internal/proto/examplepb/response_body_service.pb.go +++ b/examples/internal/proto/examplepb/response_body_service.pb.go @@ -484,7 +484,7 @@ func file_examples_internal_proto_examplepb_response_body_service_proto_rawDescG var file_examples_internal_proto_examplepb_response_body_service_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_examples_internal_proto_examplepb_response_body_service_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_examples_internal_proto_examplepb_response_body_service_proto_goTypes = []interface{}{ +var file_examples_internal_proto_examplepb_response_body_service_proto_goTypes = []any{ (RepeatedResponseBodyOut_Response_ResponseType)(0), // 0: grpc.gateway.examples.internal.proto.examplepb.RepeatedResponseBodyOut.Response.ResponseType (*ResponseBodyIn)(nil), // 1: grpc.gateway.examples.internal.proto.examplepb.ResponseBodyIn (*ResponseBodyOut)(nil), // 2: grpc.gateway.examples.internal.proto.examplepb.ResponseBodyOut @@ -518,7 +518,7 @@ func file_examples_internal_proto_examplepb_response_body_service_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_examplepb_response_body_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_response_body_service_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ResponseBodyIn); i { case 0: return &v.state @@ -530,7 +530,7 @@ func file_examples_internal_proto_examplepb_response_body_service_proto_init() { return nil } } - file_examples_internal_proto_examplepb_response_body_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_response_body_service_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ResponseBodyOut); i { case 0: return &v.state @@ -542,7 +542,7 @@ func file_examples_internal_proto_examplepb_response_body_service_proto_init() { return nil } } - file_examples_internal_proto_examplepb_response_body_service_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_response_body_service_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*RepeatedResponseBodyOut); i { case 0: return &v.state @@ -554,7 +554,7 @@ func file_examples_internal_proto_examplepb_response_body_service_proto_init() { return nil } } - file_examples_internal_proto_examplepb_response_body_service_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_response_body_service_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*RepeatedResponseStrings); i { case 0: return &v.state @@ -566,7 +566,7 @@ func file_examples_internal_proto_examplepb_response_body_service_proto_init() { return nil } } - file_examples_internal_proto_examplepb_response_body_service_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_response_body_service_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*ResponseBodyOut_Response); i { case 0: return &v.state @@ -578,7 +578,7 @@ func file_examples_internal_proto_examplepb_response_body_service_proto_init() { return nil } } - file_examples_internal_proto_examplepb_response_body_service_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_response_body_service_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*RepeatedResponseBodyOut_Response); i { case 0: return &v.state diff --git a/examples/internal/proto/examplepb/response_body_service.pb.gw.go b/examples/internal/proto/examplepb/response_body_service.pb.gw.go index ac13e09..f201fc8 100644 --- a/examples/internal/proto/examplepb/response_body_service.pb.gw.go +++ b/examples/internal/proto/examplepb/response_body_service.pb.gw.go @@ -448,7 +448,7 @@ type response_ResponseBodyService_GetResponseBody_0 struct { proto.Message } -func (m response_ResponseBodyService_GetResponseBody_0) XXX_ResponseBody() interface{} { +func (m response_ResponseBodyService_GetResponseBody_0) XXX_ResponseBody() any { response := m.Message.(*ResponseBodyOut) return response.Response } @@ -457,7 +457,7 @@ type response_ResponseBodyService_ListResponseBodies_0 struct { proto.Message } -func (m response_ResponseBodyService_ListResponseBodies_0) XXX_ResponseBody() interface{} { +func (m response_ResponseBodyService_ListResponseBodies_0) XXX_ResponseBody() any { response := m.Message.(*RepeatedResponseBodyOut) return response.Response } @@ -466,7 +466,7 @@ type response_ResponseBodyService_ListResponseStrings_0 struct { proto.Message } -func (m response_ResponseBodyService_ListResponseStrings_0) XXX_ResponseBody() interface{} { +func (m response_ResponseBodyService_ListResponseStrings_0) XXX_ResponseBody() any { response := m.Message.(*RepeatedResponseStrings) return response.Values } @@ -475,7 +475,7 @@ type response_ResponseBodyService_GetResponseBodyStream_0 struct { proto.Message } -func (m response_ResponseBodyService_GetResponseBodyStream_0) XXX_ResponseBody() interface{} { +func (m response_ResponseBodyService_GetResponseBodyStream_0) XXX_ResponseBody() any { response := m.Message.(*ResponseBodyOut) return response.Response } diff --git a/examples/internal/proto/examplepb/response_body_service_grpc.pb.go b/examples/internal/proto/examplepb/response_body_service_grpc.pb.go index 162063d..1705272 100644 --- a/examples/internal/proto/examplepb/response_body_service_grpc.pb.go +++ b/examples/internal/proto/examplepb/response_body_service_grpc.pb.go @@ -129,7 +129,7 @@ func RegisterResponseBodyServiceServer(s grpc.ServiceRegistrar, srv ResponseBody s.RegisterService(&ResponseBodyService_ServiceDesc, srv) } -func _ResponseBodyService_GetResponseBody_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ResponseBodyService_GetResponseBody_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ResponseBodyIn) if err := dec(in); err != nil { return nil, err @@ -141,13 +141,13 @@ func _ResponseBodyService_GetResponseBody_Handler(srv interface{}, ctx context.C Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ResponseBodyService/GetResponseBody", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ResponseBodyServiceServer).GetResponseBody(ctx, req.(*ResponseBodyIn)) } return interceptor(ctx, in, info, handler) } -func _ResponseBodyService_ListResponseBodies_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ResponseBodyService_ListResponseBodies_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ResponseBodyIn) if err := dec(in); err != nil { return nil, err @@ -159,13 +159,13 @@ func _ResponseBodyService_ListResponseBodies_Handler(srv interface{}, ctx contex Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ResponseBodyService/ListResponseBodies", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ResponseBodyServiceServer).ListResponseBodies(ctx, req.(*ResponseBodyIn)) } return interceptor(ctx, in, info, handler) } -func _ResponseBodyService_ListResponseStrings_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ResponseBodyService_ListResponseStrings_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(ResponseBodyIn) if err := dec(in); err != nil { return nil, err @@ -177,13 +177,13 @@ func _ResponseBodyService_ListResponseStrings_Handler(srv interface{}, ctx conte Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.ResponseBodyService/ListResponseStrings", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(ResponseBodyServiceServer).ListResponseStrings(ctx, req.(*ResponseBodyIn)) } return interceptor(ctx, in, info, handler) } -func _ResponseBodyService_GetResponseBodyStream_Handler(srv interface{}, stream grpc.ServerStream) error { +func _ResponseBodyService_GetResponseBodyStream_Handler(srv any, stream grpc.ServerStream) error { m := new(ResponseBodyIn) if err := stream.RecvMsg(m); err != nil { return err diff --git a/examples/internal/proto/examplepb/stream.pb.go b/examples/internal/proto/examplepb/stream.pb.go index ff9c0d5..f02c406 100644 --- a/examples/internal/proto/examplepb/stream.pb.go +++ b/examples/internal/proto/examplepb/stream.pb.go @@ -88,7 +88,7 @@ var file_examples_internal_proto_examplepb_stream_proto_rawDesc = []byte{ 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } -var file_examples_internal_proto_examplepb_stream_proto_goTypes = []interface{}{ +var file_examples_internal_proto_examplepb_stream_proto_goTypes = []any{ (*ABitOfEverything)(nil), // 0: grpc.gateway.examples.internal.proto.examplepb.ABitOfEverything (*emptypb.Empty)(nil), // 1: google.protobuf.Empty (*sub.StringMessage)(nil), // 2: grpc.gateway.examples.internal.proto.sub.StringMessage diff --git a/examples/internal/proto/examplepb/stream_grpc.pb.go b/examples/internal/proto/examplepb/stream_grpc.pb.go index 0d1d167..974d82b 100644 --- a/examples/internal/proto/examplepb/stream_grpc.pb.go +++ b/examples/internal/proto/examplepb/stream_grpc.pb.go @@ -202,7 +202,7 @@ func RegisterStreamServiceServer(s grpc.ServiceRegistrar, srv StreamServiceServe s.RegisterService(&StreamService_ServiceDesc, srv) } -func _StreamService_BulkCreate_Handler(srv interface{}, stream grpc.ServerStream) error { +func _StreamService_BulkCreate_Handler(srv any, stream grpc.ServerStream) error { return srv.(StreamServiceServer).BulkCreate(&streamServiceBulkCreateServer{stream}) } @@ -228,7 +228,7 @@ func (x *streamServiceBulkCreateServer) Recv() (*ABitOfEverything, error) { return m, nil } -func _StreamService_List_Handler(srv interface{}, stream grpc.ServerStream) error { +func _StreamService_List_Handler(srv any, stream grpc.ServerStream) error { m := new(emptypb.Empty) if err := stream.RecvMsg(m); err != nil { return err @@ -249,7 +249,7 @@ func (x *streamServiceListServer) Send(m *ABitOfEverything) error { return x.ServerStream.SendMsg(m) } -func _StreamService_BulkEcho_Handler(srv interface{}, stream grpc.ServerStream) error { +func _StreamService_BulkEcho_Handler(srv any, stream grpc.ServerStream) error { return srv.(StreamServiceServer).BulkEcho(&streamServiceBulkEchoServer{stream}) } @@ -275,7 +275,7 @@ func (x *streamServiceBulkEchoServer) Recv() (*sub.StringMessage, error) { return m, nil } -func _StreamService_Download_Handler(srv interface{}, stream grpc.ServerStream) error { +func _StreamService_Download_Handler(srv any, stream grpc.ServerStream) error { m := new(emptypb.Empty) if err := stream.RecvMsg(m); err != nil { return err diff --git a/examples/internal/proto/examplepb/unannotated_echo_service.pb.go b/examples/internal/proto/examplepb/unannotated_echo_service.pb.go index 1197b91..5706b9d 100644 --- a/examples/internal/proto/examplepb/unannotated_echo_service.pb.go +++ b/examples/internal/proto/examplepb/unannotated_echo_service.pb.go @@ -359,7 +359,7 @@ func file_examples_internal_proto_examplepb_unannotated_echo_service_proto_rawDe } var file_examples_internal_proto_examplepb_unannotated_echo_service_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_examples_internal_proto_examplepb_unannotated_echo_service_proto_goTypes = []interface{}{ +var file_examples_internal_proto_examplepb_unannotated_echo_service_proto_goTypes = []any{ (*UnannotatedEmbedded)(nil), // 0: grpc.gateway.examples.internal.proto.examplepb.UnannotatedEmbedded (*UnannotatedSimpleMessage)(nil), // 1: grpc.gateway.examples.internal.proto.examplepb.UnannotatedSimpleMessage (*durationpb.Duration)(nil), // 2: google.protobuf.Duration @@ -387,7 +387,7 @@ func file_examples_internal_proto_examplepb_unannotated_echo_service_proto_init( return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_examplepb_unannotated_echo_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_unannotated_echo_service_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*UnannotatedEmbedded); i { case 0: return &v.state @@ -399,7 +399,7 @@ func file_examples_internal_proto_examplepb_unannotated_echo_service_proto_init( return nil } } - file_examples_internal_proto_examplepb_unannotated_echo_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_unannotated_echo_service_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*UnannotatedSimpleMessage); i { case 0: return &v.state @@ -412,11 +412,11 @@ func file_examples_internal_proto_examplepb_unannotated_echo_service_proto_init( } } } - file_examples_internal_proto_examplepb_unannotated_echo_service_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_examples_internal_proto_examplepb_unannotated_echo_service_proto_msgTypes[0].OneofWrappers = []any{ (*UnannotatedEmbedded_Progress)(nil), (*UnannotatedEmbedded_Note)(nil), } - file_examples_internal_proto_examplepb_unannotated_echo_service_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_examples_internal_proto_examplepb_unannotated_echo_service_proto_msgTypes[1].OneofWrappers = []any{ (*UnannotatedSimpleMessage_LineNum)(nil), (*UnannotatedSimpleMessage_Lang)(nil), (*UnannotatedSimpleMessage_En)(nil), diff --git a/examples/internal/proto/examplepb/unannotated_echo_service_grpc.pb.go b/examples/internal/proto/examplepb/unannotated_echo_service_grpc.pb.go index ac3b18f..cb51990 100644 --- a/examples/internal/proto/examplepb/unannotated_echo_service_grpc.pb.go +++ b/examples/internal/proto/examplepb/unannotated_echo_service_grpc.pb.go @@ -104,7 +104,7 @@ func RegisterUnannotatedEchoServiceServer(s grpc.ServiceRegistrar, srv Unannotat s.RegisterService(&UnannotatedEchoService_ServiceDesc, srv) } -func _UnannotatedEchoService_Echo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _UnannotatedEchoService_Echo_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(UnannotatedSimpleMessage) if err := dec(in); err != nil { return nil, err @@ -116,13 +116,13 @@ func _UnannotatedEchoService_Echo_Handler(srv interface{}, ctx context.Context, Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.UnannotatedEchoService/Echo", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(UnannotatedEchoServiceServer).Echo(ctx, req.(*UnannotatedSimpleMessage)) } return interceptor(ctx, in, info, handler) } -func _UnannotatedEchoService_EchoBody_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _UnannotatedEchoService_EchoBody_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(UnannotatedSimpleMessage) if err := dec(in); err != nil { return nil, err @@ -134,13 +134,13 @@ func _UnannotatedEchoService_EchoBody_Handler(srv interface{}, ctx context.Conte Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.UnannotatedEchoService/EchoBody", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(UnannotatedEchoServiceServer).EchoBody(ctx, req.(*UnannotatedSimpleMessage)) } return interceptor(ctx, in, info, handler) } -func _UnannotatedEchoService_EchoDelete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _UnannotatedEchoService_EchoDelete_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(UnannotatedSimpleMessage) if err := dec(in); err != nil { return nil, err @@ -152,7 +152,7 @@ func _UnannotatedEchoService_EchoDelete_Handler(srv interface{}, ctx context.Con Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.UnannotatedEchoService/EchoDelete", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(UnannotatedEchoServiceServer).EchoDelete(ctx, req.(*UnannotatedSimpleMessage)) } return interceptor(ctx, in, info, handler) diff --git a/examples/internal/proto/examplepb/use_go_template.pb.go b/examples/internal/proto/examplepb/use_go_template.pb.go index 3d341d1..c0f2fe1 100644 --- a/examples/internal/proto/examplepb/use_go_template.pb.go +++ b/examples/internal/proto/examplepb/use_go_template.pb.go @@ -329,7 +329,7 @@ func file_examples_internal_proto_examplepb_use_go_template_proto_rawDescGZIP() } var file_examples_internal_proto_examplepb_use_go_template_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_examples_internal_proto_examplepb_use_go_template_proto_goTypes = []interface{}{ +var file_examples_internal_proto_examplepb_use_go_template_proto_goTypes = []any{ (*LoginRequest)(nil), // 0: grpc.gateway.examples.internal.proto.examplepb.LoginRequest (*LoginReply)(nil), // 1: grpc.gateway.examples.internal.proto.examplepb.LoginReply (*LogoutRequest)(nil), // 2: grpc.gateway.examples.internal.proto.examplepb.LogoutRequest @@ -353,7 +353,7 @@ func file_examples_internal_proto_examplepb_use_go_template_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_examplepb_use_go_template_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_use_go_template_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*LoginRequest); i { case 0: return &v.state @@ -365,7 +365,7 @@ func file_examples_internal_proto_examplepb_use_go_template_proto_init() { return nil } } - file_examples_internal_proto_examplepb_use_go_template_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_use_go_template_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*LoginReply); i { case 0: return &v.state @@ -377,7 +377,7 @@ func file_examples_internal_proto_examplepb_use_go_template_proto_init() { return nil } } - file_examples_internal_proto_examplepb_use_go_template_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_use_go_template_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*LogoutRequest); i { case 0: return &v.state @@ -389,7 +389,7 @@ func file_examples_internal_proto_examplepb_use_go_template_proto_init() { return nil } } - file_examples_internal_proto_examplepb_use_go_template_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_use_go_template_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*LogoutReply); i { case 0: return &v.state diff --git a/examples/internal/proto/examplepb/use_go_template_grpc.pb.go b/examples/internal/proto/examplepb/use_go_template_grpc.pb.go index e4bea74..287f89c 100644 --- a/examples/internal/proto/examplepb/use_go_template_grpc.pb.go +++ b/examples/internal/proto/examplepb/use_go_template_grpc.pb.go @@ -134,7 +134,7 @@ func RegisterLoginServiceServer(s grpc.ServiceRegistrar, srv LoginServiceServer) s.RegisterService(&LoginService_ServiceDesc, srv) } -func _LoginService_Login_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _LoginService_Login_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(LoginRequest) if err := dec(in); err != nil { return nil, err @@ -146,13 +146,13 @@ func _LoginService_Login_Handler(srv interface{}, ctx context.Context, dec func( Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.LoginService/Login", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(LoginServiceServer).Login(ctx, req.(*LoginRequest)) } return interceptor(ctx, in, info, handler) } -func _LoginService_Logout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _LoginService_Logout_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(LogoutRequest) if err := dec(in); err != nil { return nil, err @@ -164,7 +164,7 @@ func _LoginService_Logout_Handler(srv interface{}, ctx context.Context, dec func Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.LoginService/Logout", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(LoginServiceServer).Logout(ctx, req.(*LogoutRequest)) } return interceptor(ctx, in, info, handler) diff --git a/examples/internal/proto/examplepb/visibility_rule_echo_service.pb.go b/examples/internal/proto/examplepb/visibility_rule_echo_service.pb.go index b40bf7d..3b3a812 100644 --- a/examples/internal/proto/examplepb/visibility_rule_echo_service.pb.go +++ b/examples/internal/proto/examplepb/visibility_rule_echo_service.pb.go @@ -536,7 +536,7 @@ func file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_r var file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_goTypes = []interface{}{ +var file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_goTypes = []any{ (VisibilityRuleSimpleMessage_VisibilityEnum)(0), // 0: grpc.gateway.examples.internal.proto.examplepb.VisibilityRuleSimpleMessage.VisibilityEnum (*VisibilityRuleEmbedded)(nil), // 1: grpc.gateway.examples.internal.proto.examplepb.VisibilityRuleEmbedded (*VisibilityRuleSimpleMessage)(nil), // 2: grpc.gateway.examples.internal.proto.examplepb.VisibilityRuleSimpleMessage @@ -568,7 +568,7 @@ func file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_i return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*VisibilityRuleEmbedded); i { case 0: return &v.state @@ -580,7 +580,7 @@ func file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_i return nil } } - file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*VisibilityRuleSimpleMessage); i { case 0: return &v.state @@ -593,13 +593,13 @@ func file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_i } } } - file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_msgTypes[0].OneofWrappers = []any{ (*VisibilityRuleEmbedded_Progress)(nil), (*VisibilityRuleEmbedded_Note)(nil), (*VisibilityRuleEmbedded_InternalField)(nil), (*VisibilityRuleEmbedded_PreviewField)(nil), } - file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_examples_internal_proto_examplepb_visibility_rule_echo_service_proto_msgTypes[1].OneofWrappers = []any{ (*VisibilityRuleSimpleMessage_LineNum)(nil), (*VisibilityRuleSimpleMessage_Lang)(nil), (*VisibilityRuleSimpleMessage_En)(nil), diff --git a/examples/internal/proto/examplepb/visibility_rule_echo_service_grpc.pb.go b/examples/internal/proto/examplepb/visibility_rule_echo_service_grpc.pb.go index a7e90ea..29f502d 100644 --- a/examples/internal/proto/examplepb/visibility_rule_echo_service_grpc.pb.go +++ b/examples/internal/proto/examplepb/visibility_rule_echo_service_grpc.pb.go @@ -122,7 +122,7 @@ func RegisterVisibilityRuleEchoServiceServer(s grpc.ServiceRegistrar, srv Visibi s.RegisterService(&VisibilityRuleEchoService_ServiceDesc, srv) } -func _VisibilityRuleEchoService_Echo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _VisibilityRuleEchoService_Echo_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(VisibilityRuleSimpleMessage) if err := dec(in); err != nil { return nil, err @@ -134,13 +134,13 @@ func _VisibilityRuleEchoService_Echo_Handler(srv interface{}, ctx context.Contex Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.VisibilityRuleEchoService/Echo", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(VisibilityRuleEchoServiceServer).Echo(ctx, req.(*VisibilityRuleSimpleMessage)) } return interceptor(ctx, in, info, handler) } -func _VisibilityRuleEchoService_EchoInternal_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _VisibilityRuleEchoService_EchoInternal_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(VisibilityRuleSimpleMessage) if err := dec(in); err != nil { return nil, err @@ -152,13 +152,13 @@ func _VisibilityRuleEchoService_EchoInternal_Handler(srv interface{}, ctx contex Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.VisibilityRuleEchoService/EchoInternal", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(VisibilityRuleEchoServiceServer).EchoInternal(ctx, req.(*VisibilityRuleSimpleMessage)) } return interceptor(ctx, in, info, handler) } -func _VisibilityRuleEchoService_EchoPreview_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _VisibilityRuleEchoService_EchoPreview_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(VisibilityRuleSimpleMessage) if err := dec(in); err != nil { return nil, err @@ -170,13 +170,13 @@ func _VisibilityRuleEchoService_EchoPreview_Handler(srv interface{}, ctx context Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.VisibilityRuleEchoService/EchoPreview", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(VisibilityRuleEchoServiceServer).EchoPreview(ctx, req.(*VisibilityRuleSimpleMessage)) } return interceptor(ctx, in, info, handler) } -func _VisibilityRuleEchoService_EchoInternalAndPreview_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _VisibilityRuleEchoService_EchoInternalAndPreview_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(VisibilityRuleSimpleMessage) if err := dec(in); err != nil { return nil, err @@ -188,7 +188,7 @@ func _VisibilityRuleEchoService_EchoInternalAndPreview_Handler(srv interface{}, Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.VisibilityRuleEchoService/EchoInternalAndPreview", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(VisibilityRuleEchoServiceServer).EchoInternalAndPreview(ctx, req.(*VisibilityRuleSimpleMessage)) } return interceptor(ctx, in, info, handler) @@ -276,7 +276,7 @@ func RegisterVisibilityRuleInternalEchoServiceServer(s grpc.ServiceRegistrar, sr s.RegisterService(&VisibilityRuleInternalEchoService_ServiceDesc, srv) } -func _VisibilityRuleInternalEchoService_Echo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _VisibilityRuleInternalEchoService_Echo_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(VisibilityRuleSimpleMessage) if err := dec(in); err != nil { return nil, err @@ -288,7 +288,7 @@ func _VisibilityRuleInternalEchoService_Echo_Handler(srv interface{}, ctx contex Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.VisibilityRuleInternalEchoService/Echo", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(VisibilityRuleInternalEchoServiceServer).Echo(ctx, req.(*VisibilityRuleSimpleMessage)) } return interceptor(ctx, in, info, handler) diff --git a/examples/internal/proto/examplepb/wrappers.pb.go b/examples/internal/proto/examplepb/wrappers.pb.go index 8803cd7..a40b0c2 100644 --- a/examples/internal/proto/examplepb/wrappers.pb.go +++ b/examples/internal/proto/examplepb/wrappers.pb.go @@ -282,7 +282,7 @@ func file_examples_internal_proto_examplepb_wrappers_proto_rawDescGZIP() []byte } var file_examples_internal_proto_examplepb_wrappers_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_examples_internal_proto_examplepb_wrappers_proto_goTypes = []interface{}{ +var file_examples_internal_proto_examplepb_wrappers_proto_goTypes = []any{ (*Wrappers)(nil), // 0: grpc.gateway.examples.internal.proto.examplepb.Wrappers (*wrapperspb.StringValue)(nil), // 1: google.protobuf.StringValue (*wrapperspb.Int32Value)(nil), // 2: google.protobuf.Int32Value @@ -340,7 +340,7 @@ func file_examples_internal_proto_examplepb_wrappers_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_examplepb_wrappers_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_examplepb_wrappers_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*Wrappers); i { case 0: return &v.state diff --git a/examples/internal/proto/examplepb/wrappers_grpc.pb.go b/examples/internal/proto/examplepb/wrappers_grpc.pb.go index 6f3aa5f..595bc05 100644 --- a/examples/internal/proto/examplepb/wrappers_grpc.pb.go +++ b/examples/internal/proto/examplepb/wrappers_grpc.pb.go @@ -206,7 +206,7 @@ func RegisterWrappersServiceServer(s grpc.ServiceRegistrar, srv WrappersServiceS s.RegisterService(&WrappersService_ServiceDesc, srv) } -func _WrappersService_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _WrappersService_Create_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(Wrappers) if err := dec(in); err != nil { return nil, err @@ -218,13 +218,13 @@ func _WrappersService_Create_Handler(srv interface{}, ctx context.Context, dec f Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.WrappersService/Create", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(WrappersServiceServer).Create(ctx, req.(*Wrappers)) } return interceptor(ctx, in, info, handler) } -func _WrappersService_CreateStringValue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _WrappersService_CreateStringValue_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(wrapperspb.StringValue) if err := dec(in); err != nil { return nil, err @@ -236,13 +236,13 @@ func _WrappersService_CreateStringValue_Handler(srv interface{}, ctx context.Con Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.WrappersService/CreateStringValue", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(WrappersServiceServer).CreateStringValue(ctx, req.(*wrapperspb.StringValue)) } return interceptor(ctx, in, info, handler) } -func _WrappersService_CreateInt32Value_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _WrappersService_CreateInt32Value_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(wrapperspb.Int32Value) if err := dec(in); err != nil { return nil, err @@ -254,13 +254,13 @@ func _WrappersService_CreateInt32Value_Handler(srv interface{}, ctx context.Cont Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.WrappersService/CreateInt32Value", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(WrappersServiceServer).CreateInt32Value(ctx, req.(*wrapperspb.Int32Value)) } return interceptor(ctx, in, info, handler) } -func _WrappersService_CreateInt64Value_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _WrappersService_CreateInt64Value_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(wrapperspb.Int64Value) if err := dec(in); err != nil { return nil, err @@ -272,13 +272,13 @@ func _WrappersService_CreateInt64Value_Handler(srv interface{}, ctx context.Cont Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.WrappersService/CreateInt64Value", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(WrappersServiceServer).CreateInt64Value(ctx, req.(*wrapperspb.Int64Value)) } return interceptor(ctx, in, info, handler) } -func _WrappersService_CreateFloatValue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _WrappersService_CreateFloatValue_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(wrapperspb.FloatValue) if err := dec(in); err != nil { return nil, err @@ -290,13 +290,13 @@ func _WrappersService_CreateFloatValue_Handler(srv interface{}, ctx context.Cont Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.WrappersService/CreateFloatValue", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(WrappersServiceServer).CreateFloatValue(ctx, req.(*wrapperspb.FloatValue)) } return interceptor(ctx, in, info, handler) } -func _WrappersService_CreateDoubleValue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _WrappersService_CreateDoubleValue_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(wrapperspb.DoubleValue) if err := dec(in); err != nil { return nil, err @@ -308,13 +308,13 @@ func _WrappersService_CreateDoubleValue_Handler(srv interface{}, ctx context.Con Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.WrappersService/CreateDoubleValue", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(WrappersServiceServer).CreateDoubleValue(ctx, req.(*wrapperspb.DoubleValue)) } return interceptor(ctx, in, info, handler) } -func _WrappersService_CreateBoolValue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _WrappersService_CreateBoolValue_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(wrapperspb.BoolValue) if err := dec(in); err != nil { return nil, err @@ -326,13 +326,13 @@ func _WrappersService_CreateBoolValue_Handler(srv interface{}, ctx context.Conte Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.WrappersService/CreateBoolValue", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(WrappersServiceServer).CreateBoolValue(ctx, req.(*wrapperspb.BoolValue)) } return interceptor(ctx, in, info, handler) } -func _WrappersService_CreateUInt32Value_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _WrappersService_CreateUInt32Value_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(wrapperspb.UInt32Value) if err := dec(in); err != nil { return nil, err @@ -344,13 +344,13 @@ func _WrappersService_CreateUInt32Value_Handler(srv interface{}, ctx context.Con Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.WrappersService/CreateUInt32Value", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(WrappersServiceServer).CreateUInt32Value(ctx, req.(*wrapperspb.UInt32Value)) } return interceptor(ctx, in, info, handler) } -func _WrappersService_CreateUInt64Value_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _WrappersService_CreateUInt64Value_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(wrapperspb.UInt64Value) if err := dec(in); err != nil { return nil, err @@ -362,13 +362,13 @@ func _WrappersService_CreateUInt64Value_Handler(srv interface{}, ctx context.Con Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.WrappersService/CreateUInt64Value", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(WrappersServiceServer).CreateUInt64Value(ctx, req.(*wrapperspb.UInt64Value)) } return interceptor(ctx, in, info, handler) } -func _WrappersService_CreateBytesValue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _WrappersService_CreateBytesValue_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(wrapperspb.BytesValue) if err := dec(in); err != nil { return nil, err @@ -380,13 +380,13 @@ func _WrappersService_CreateBytesValue_Handler(srv interface{}, ctx context.Cont Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.WrappersService/CreateBytesValue", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(WrappersServiceServer).CreateBytesValue(ctx, req.(*wrapperspb.BytesValue)) } return interceptor(ctx, in, info, handler) } -func _WrappersService_CreateEmpty_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _WrappersService_CreateEmpty_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err @@ -398,7 +398,7 @@ func _WrappersService_CreateEmpty_Handler(srv interface{}, ctx context.Context, Server: srv, FullMethod: "/grpc.gateway.examples.internal.proto.examplepb.WrappersService/CreateEmpty", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(WrappersServiceServer).CreateEmpty(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) diff --git a/examples/internal/proto/oneofenum/oneof_enum.pb.go b/examples/internal/proto/oneofenum/oneof_enum.pb.go index 3a728cb..5e7c1de 100644 --- a/examples/internal/proto/oneofenum/oneof_enum.pb.go +++ b/examples/internal/proto/oneofenum/oneof_enum.pb.go @@ -175,7 +175,7 @@ func file_examples_internal_proto_oneofenum_oneof_enum_proto_rawDescGZIP() []byt var file_examples_internal_proto_oneofenum_oneof_enum_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_examples_internal_proto_oneofenum_oneof_enum_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_examples_internal_proto_oneofenum_oneof_enum_proto_goTypes = []interface{}{ +var file_examples_internal_proto_oneofenum_oneof_enum_proto_goTypes = []any{ (ExampleEnum)(0), // 0: grpc.gateway.examples.internal.proto.oneofenum.ExampleEnum (*OneofEnumMessage)(nil), // 1: grpc.gateway.examples.internal.proto.oneofenum.OneofEnumMessage } @@ -194,7 +194,7 @@ func file_examples_internal_proto_oneofenum_oneof_enum_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_oneofenum_oneof_enum_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_oneofenum_oneof_enum_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*OneofEnumMessage); i { case 0: return &v.state @@ -207,7 +207,7 @@ func file_examples_internal_proto_oneofenum_oneof_enum_proto_init() { } } } - file_examples_internal_proto_oneofenum_oneof_enum_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_examples_internal_proto_oneofenum_oneof_enum_proto_msgTypes[0].OneofWrappers = []any{ (*OneofEnumMessage_ExampleEnum)(nil), } type x struct{} diff --git a/examples/internal/proto/pathenum/path_enum.pb.go b/examples/internal/proto/pathenum/path_enum.pb.go index f6add3c..3d95628 100644 --- a/examples/internal/proto/pathenum/path_enum.pb.go +++ b/examples/internal/proto/pathenum/path_enum.pb.go @@ -348,7 +348,7 @@ func file_examples_internal_proto_pathenum_path_enum_proto_rawDescGZIP() []byte var file_examples_internal_proto_pathenum_path_enum_proto_enumTypes = make([]protoimpl.EnumInfo, 3) var file_examples_internal_proto_pathenum_path_enum_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_examples_internal_proto_pathenum_path_enum_proto_goTypes = []interface{}{ +var file_examples_internal_proto_pathenum_path_enum_proto_goTypes = []any{ (PathEnum)(0), // 0: grpc.gateway.examples.internal.pathenum.PathEnum (SnakeCaseForImport)(0), // 1: grpc.gateway.examples.internal.pathenum.snake_case_for_import (MessagePathEnum_NestedPathEnum)(0), // 2: grpc.gateway.examples.internal.pathenum.MessagePathEnum.NestedPathEnum @@ -372,7 +372,7 @@ func file_examples_internal_proto_pathenum_path_enum_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_pathenum_path_enum_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_pathenum_path_enum_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*MessagePathEnum); i { case 0: return &v.state @@ -384,7 +384,7 @@ func file_examples_internal_proto_pathenum_path_enum_proto_init() { return nil } } - file_examples_internal_proto_pathenum_path_enum_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_pathenum_path_enum_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*MessageWithPathEnum); i { case 0: return &v.state @@ -396,7 +396,7 @@ func file_examples_internal_proto_pathenum_path_enum_proto_init() { return nil } } - file_examples_internal_proto_pathenum_path_enum_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_pathenum_path_enum_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*MessageWithNestedPathEnum); i { case 0: return &v.state diff --git a/examples/internal/proto/sub/message.pb.go b/examples/internal/proto/sub/message.pb.go index fa72658..7631ce5 100644 --- a/examples/internal/proto/sub/message.pb.go +++ b/examples/internal/proto/sub/message.pb.go @@ -98,7 +98,7 @@ func file_examples_internal_proto_sub_message_proto_rawDescGZIP() []byte { } var file_examples_internal_proto_sub_message_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_examples_internal_proto_sub_message_proto_goTypes = []interface{}{ +var file_examples_internal_proto_sub_message_proto_goTypes = []any{ (*StringMessage)(nil), // 0: grpc.gateway.examples.internal.proto.sub.StringMessage } var file_examples_internal_proto_sub_message_proto_depIdxs = []int32{ @@ -115,7 +115,7 @@ func file_examples_internal_proto_sub_message_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_sub_message_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_sub_message_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*StringMessage); i { case 0: return &v.state diff --git a/examples/internal/proto/sub2/message.pb.go b/examples/internal/proto/sub2/message.pb.go index 55f7be3..0467572 100644 --- a/examples/internal/proto/sub2/message.pb.go +++ b/examples/internal/proto/sub2/message.pb.go @@ -98,7 +98,7 @@ func file_examples_internal_proto_sub2_message_proto_rawDescGZIP() []byte { } var file_examples_internal_proto_sub2_message_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_examples_internal_proto_sub2_message_proto_goTypes = []interface{}{ +var file_examples_internal_proto_sub2_message_proto_goTypes = []any{ (*IdMessage)(nil), // 0: grpc.gateway.examples.internal.proto.sub2.IdMessage } var file_examples_internal_proto_sub2_message_proto_depIdxs = []int32{ @@ -115,7 +115,7 @@ func file_examples_internal_proto_sub2_message_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_examples_internal_proto_sub2_message_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_examples_internal_proto_sub2_message_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*IdMessage); i { case 0: return &v.state diff --git a/internal/descriptor/apiconfig/apiconfig.pb.go b/internal/descriptor/apiconfig/apiconfig.pb.go index 80506dc..ff7f263 100644 --- a/internal/descriptor/apiconfig/apiconfig.pb.go +++ b/internal/descriptor/apiconfig/apiconfig.pb.go @@ -112,7 +112,7 @@ func file_internal_descriptor_apiconfig_apiconfig_proto_rawDescGZIP() []byte { } var file_internal_descriptor_apiconfig_apiconfig_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_internal_descriptor_apiconfig_apiconfig_proto_goTypes = []interface{}{ +var file_internal_descriptor_apiconfig_apiconfig_proto_goTypes = []any{ (*GrpcAPIService)(nil), // 0: grpc.gateway.internal.descriptor.apiconfig.GrpcAPIService (*annotations.Http)(nil), // 1: google.api.Http } @@ -131,7 +131,7 @@ func file_internal_descriptor_apiconfig_apiconfig_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_internal_descriptor_apiconfig_apiconfig_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_internal_descriptor_apiconfig_apiconfig_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*GrpcAPIService); i { case 0: return &v.state diff --git a/internal/descriptor/grpc_api_configuration.go b/internal/descriptor/grpc_api_configuration.go index a3ae3b8..37f3fae 100644 --- a/internal/descriptor/grpc_api_configuration.go +++ b/internal/descriptor/grpc_api_configuration.go @@ -12,7 +12,7 @@ import ( ) func loadGrpcAPIServiceFromYAML(yamlFileContents []byte, yamlSourceLogName string) (*apiconfig.GrpcAPIService, error) { - var yamlContents interface{} + var yamlContents any err := yaml.Unmarshal(yamlFileContents, &yamlContents) if err != nil { return nil, fmt.Errorf("failed to parse gRPC API Configuration from YAML in '%v': %v", yamlSourceLogName, err) diff --git a/internal/descriptor/openapi_configuration.go b/internal/descriptor/openapi_configuration.go index 3487c06..9699d9a 100644 --- a/internal/descriptor/openapi_configuration.go +++ b/internal/descriptor/openapi_configuration.go @@ -11,7 +11,7 @@ import ( ) func loadOpenAPIConfigFromYAML(yamlFileContents []byte, yamlSourceLogName string) (*openapiconfig.OpenAPIConfig, error) { - var yamlContents interface{} + var yamlContents any err := yaml.Unmarshal(yamlFileContents, &yamlContents) if err != nil { return nil, fmt.Errorf("failed to parse gRPC API Configuration from YAML in '%v': %v", yamlSourceLogName, err) diff --git a/internal/descriptor/openapiconfig/openapiconfig.pb.go b/internal/descriptor/openapiconfig/openapiconfig.pb.go index 7394255..8ff9ec3 100644 --- a/internal/descriptor/openapiconfig/openapiconfig.pb.go +++ b/internal/descriptor/openapiconfig/openapiconfig.pb.go @@ -538,7 +538,7 @@ func file_internal_descriptor_openapiconfig_openapiconfig_proto_rawDescGZIP() [] } var file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_internal_descriptor_openapiconfig_openapiconfig_proto_goTypes = []interface{}{ +var file_internal_descriptor_openapiconfig_openapiconfig_proto_goTypes = []any{ (*OpenAPIFileOption)(nil), // 0: grpc.gateway.internal.descriptor.openapiconfig.OpenAPIFileOption (*OpenAPIMethodOption)(nil), // 1: grpc.gateway.internal.descriptor.openapiconfig.OpenAPIMethodOption (*OpenAPIMessageOption)(nil), // 2: grpc.gateway.internal.descriptor.openapiconfig.OpenAPIMessageOption @@ -577,7 +577,7 @@ func file_internal_descriptor_openapiconfig_openapiconfig_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*OpenAPIFileOption); i { case 0: return &v.state @@ -589,7 +589,7 @@ func file_internal_descriptor_openapiconfig_openapiconfig_proto_init() { return nil } } - file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*OpenAPIMethodOption); i { case 0: return &v.state @@ -601,7 +601,7 @@ func file_internal_descriptor_openapiconfig_openapiconfig_proto_init() { return nil } } - file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*OpenAPIMessageOption); i { case 0: return &v.state @@ -613,7 +613,7 @@ func file_internal_descriptor_openapiconfig_openapiconfig_proto_init() { return nil } } - file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*OpenAPIServiceOption); i { case 0: return &v.state @@ -625,7 +625,7 @@ func file_internal_descriptor_openapiconfig_openapiconfig_proto_init() { return nil } } - file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*OpenAPIFieldOption); i { case 0: return &v.state @@ -637,7 +637,7 @@ func file_internal_descriptor_openapiconfig_openapiconfig_proto_init() { return nil } } - file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*OpenAPIOptions); i { case 0: return &v.state @@ -649,7 +649,7 @@ func file_internal_descriptor_openapiconfig_openapiconfig_proto_init() { return nil } } - file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_internal_descriptor_openapiconfig_openapiconfig_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*OpenAPIConfig); i { case 0: return &v.state diff --git a/protoc-gen-grpc-gateway/internal/gengateway/template.go b/protoc-gen-grpc-gateway/internal/gengateway/template.go index 43d3c00..d66734e 100644 --- a/protoc-gen-grpc-gateway/internal/gengateway/template.go +++ b/protoc-gen-grpc-gateway/internal/gengateway/template.go @@ -308,7 +308,7 @@ func request_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}(ctx cont } `)) - funcMap template.FuncMap = map[string]interface{}{ + funcMap template.FuncMap = map[string]any{ "camelIdentifier": casing.CamelIdentifier, } diff --git a/protoc-gen-openapiv2/internal/genopenapi/format.go b/protoc-gen-openapiv2/internal/genopenapi/format.go index 6f0faa8..1c9a695 100644 --- a/protoc-gen-openapiv2/internal/genopenapi/format.go +++ b/protoc-gen-openapiv2/internal/genopenapi/format.go @@ -16,7 +16,7 @@ const ( ) type ContentEncoder interface { - Encode(v interface{}) (err error) + Encode(v any) (err error) } func (f Format) Validate() error { diff --git a/protoc-gen-openapiv2/internal/genopenapi/format_test.go b/protoc-gen-openapiv2/internal/genopenapi/format_test.go index 564aea5..06f7395 100644 --- a/protoc-gen-openapiv2/internal/genopenapi/format_test.go +++ b/protoc-gen-openapiv2/internal/genopenapi/format_test.go @@ -52,7 +52,7 @@ func TestFormatEncode(t *testing.T) { t.Parallel() type contentDecoder interface { - Decode(v interface{}) error + Decode(v any) error } testCases := [...]struct { diff --git a/protoc-gen-openapiv2/internal/genopenapi/generator.go b/protoc-gen-openapiv2/internal/genopenapi/generator.go index 6c61491..03e6485 100644 --- a/protoc-gen-openapiv2/internal/genopenapi/generator.go +++ b/protoc-gen-openapiv2/internal/genopenapi/generator.go @@ -104,11 +104,11 @@ func (so openapiSwaggerObject) MarshalJSON() ([]byte, error) { // type: string // // Use generics when the project will be upgraded to go 1.18+. -func (so openapiSwaggerObject) MarshalYAML() (interface{}, error) { +func (so openapiSwaggerObject) MarshalYAML() (any, error) { type Alias openapiSwaggerObject return struct { - Extension map[string]interface{} `yaml:",inline"` + Extension map[string]any `yaml:",inline"` Alias `yaml:",inline"` }{ Extension: extensionsToMap(so.extensions), @@ -121,11 +121,11 @@ func (so openapiInfoObject) MarshalJSON() ([]byte, error) { return extensionMarshalJSON(alias(so), so.extensions) } -func (so openapiInfoObject) MarshalYAML() (interface{}, error) { +func (so openapiInfoObject) MarshalYAML() (any, error) { type Alias openapiInfoObject return struct { - Extension map[string]interface{} `yaml:",inline"` + Extension map[string]any `yaml:",inline"` Alias `yaml:",inline"` }{ Extension: extensionsToMap(so.extensions), @@ -138,11 +138,11 @@ func (so openapiSecuritySchemeObject) MarshalJSON() ([]byte, error) { return extensionMarshalJSON(alias(so), so.extensions) } -func (so openapiSecuritySchemeObject) MarshalYAML() (interface{}, error) { +func (so openapiSecuritySchemeObject) MarshalYAML() (any, error) { type Alias openapiSecuritySchemeObject return struct { - Extension map[string]interface{} `yaml:",inline"` + Extension map[string]any `yaml:",inline"` Alias `yaml:",inline"` }{ Extension: extensionsToMap(so.extensions), @@ -155,11 +155,11 @@ func (so openapiOperationObject) MarshalJSON() ([]byte, error) { return extensionMarshalJSON(alias(so), so.extensions) } -func (so openapiOperationObject) MarshalYAML() (interface{}, error) { +func (so openapiOperationObject) MarshalYAML() (any, error) { type Alias openapiOperationObject return struct { - Extension map[string]interface{} `yaml:",inline"` + Extension map[string]any `yaml:",inline"` Alias `yaml:",inline"` }{ Extension: extensionsToMap(so.extensions), @@ -172,11 +172,11 @@ func (so openapiResponseObject) MarshalJSON() ([]byte, error) { return extensionMarshalJSON(alias(so), so.extensions) } -func (so openapiResponseObject) MarshalYAML() (interface{}, error) { +func (so openapiResponseObject) MarshalYAML() (any, error) { type Alias openapiResponseObject return struct { - Extension map[string]interface{} `yaml:",inline"` + Extension map[string]any `yaml:",inline"` Alias `yaml:",inline"` }{ Extension: extensionsToMap(so.extensions), @@ -189,11 +189,11 @@ func (so openapiSchemaObject) MarshalJSON() ([]byte, error) { return extensionMarshalJSON(alias(so), so.extensions) } -func (so openapiSchemaObject) MarshalYAML() (interface{}, error) { +func (so openapiSchemaObject) MarshalYAML() (any, error) { type Alias openapiSchemaObject return struct { - Extension map[string]interface{} `yaml:",inline"` + Extension map[string]any `yaml:",inline"` Alias `yaml:",inline"` }{ Extension: extensionsToMap(so.extensions), @@ -206,11 +206,11 @@ func (so openapiParameterObject) MarshalJSON() ([]byte, error) { return extensionMarshalJSON(alias(so), so.extensions) } -func (so openapiParameterObject) MarshalYAML() (interface{}, error) { +func (so openapiParameterObject) MarshalYAML() (any, error) { type Alias openapiParameterObject return struct { - Extension map[string]interface{} `yaml:",inline"` + Extension map[string]any `yaml:",inline"` Alias `yaml:",inline"` }{ Extension: extensionsToMap(so.extensions), @@ -218,7 +218,7 @@ func (so openapiParameterObject) MarshalYAML() (interface{}, error) { }, nil } -func extensionMarshalJSON(so interface{}, extensions []extension) ([]byte, error) { +func extensionMarshalJSON(so any, extensions []extension) ([]byte, error) { // To append arbitrary keys to the struct we'll render into json, // we're creating another struct that embeds the original one, and // its extra fields: @@ -362,8 +362,8 @@ func AddErrorDefs(reg *descriptor.Registry) error { }) } -func extensionsToMap(extensions []extension) map[string]interface{} { - m := make(map[string]interface{}, len(extensions)) +func extensionsToMap(extensions []extension) map[string]any { + m := make(map[string]any, len(extensions)) for _, v := range extensions { m[v.key] = RawExample(v.value) diff --git a/protoc-gen-openapiv2/internal/genopenapi/generator_test.go b/protoc-gen-openapiv2/internal/genopenapi/generator_test.go index b63915a..aeaa117 100644 --- a/protoc-gen-openapiv2/internal/genopenapi/generator_test.go +++ b/protoc-gen-openapiv2/internal/genopenapi/generator_test.go @@ -35,7 +35,7 @@ func TestGenerate_YAML(t *testing.T) { t.Fatalf("invalid count, expected: 1, actual: %d", len(resp)) } - var p map[string]interface{} + var p map[string]any err := yaml.Unmarshal([]byte(resp[0].GetContent()), &p) if err != nil { t.Fatalf("failed to unmarshall yaml: %s", err) @@ -249,7 +249,7 @@ func TestGeneratedYAMLIndent(t *testing.T) { content := resp[0].GetContent() - err := yaml.Unmarshal([]byte(content), map[string]interface{}{}) + err := yaml.Unmarshal([]byte(content), map[string]any{}) if err != nil { t.Log(content) t.Fatalf("got invalid yaml: %s", err) diff --git a/protoc-gen-openapiv2/internal/genopenapi/template.go b/protoc-gen-openapiv2/internal/genopenapi/template.go index fc4cf85..fe8d1df 100644 --- a/protoc-gen-openapiv2/internal/genopenapi/template.go +++ b/protoc-gen-openapiv2/internal/genopenapi/template.go @@ -2037,7 +2037,7 @@ func processHeaders(inputHdrs map[string]*openapi_options.Header) (openapiHeader // // If there is no 'Summary', the same behavior will be attempted on 'Title', // but only if the last character is not a period. -func updateOpenAPIDataFromComments(reg *descriptor.Registry, swaggerObject interface{}, data interface{}, comment string, isPackageObject bool) error { +func updateOpenAPIDataFromComments(reg *descriptor.Registry, swaggerObject any, data any, comment string, isPackageObject bool) error { if len(comment) == 0 { return nil } @@ -2183,7 +2183,7 @@ func protoComments(reg *descriptor.Registry, file *descriptor.File, outers []str return "" } -func goTemplateComments(comment string, data interface{}, reg *descriptor.Registry) string { +func goTemplateComments(comment string, data any, reg *descriptor.Registry) string { var temp bytes.Buffer tpl, err := template.New("").Funcs(template.FuncMap{ // Allows importing documentation from a file @@ -2551,7 +2551,7 @@ func protoJSONSchemaToOpenAPISchemaCore(j *openapi_options.JSONSchema, reg *desc return ret } -func updateswaggerObjectFromJSONSchema(s *openapiSchemaObject, j *openapi_options.JSONSchema, reg *descriptor.Registry, data interface{}) { +func updateswaggerObjectFromJSONSchema(s *openapiSchemaObject, j *openapi_options.JSONSchema, reg *descriptor.Registry, data any) { s.Title = j.GetTitle() s.Description = j.GetDescription() if reg.GetUseGoTemplate() { @@ -2645,7 +2645,7 @@ func updateSwaggerObjectFromFieldBehavior(s *openapiSchemaObject, j []annotation } } -func openapiSchemaFromProtoSchema(s *openapi_options.Schema, reg *descriptor.Registry, refs refMap, data interface{}) openapiSchemaObject { +func openapiSchemaFromProtoSchema(s *openapi_options.Schema, reg *descriptor.Registry, refs refMap, data any) openapiSchemaObject { ret := openapiSchemaObject{ ExternalDocs: protoExternalDocumentationToOpenAPIExternalDocumentation(s.GetExternalDocs(), reg, data), } @@ -2660,11 +2660,11 @@ func openapiSchemaFromProtoSchema(s *openapi_options.Schema, reg *descriptor.Reg return ret } -func openapiExamplesFromProtoExamples(in map[string]string) map[string]interface{} { +func openapiExamplesFromProtoExamples(in map[string]string) map[string]any { if len(in) == 0 { return nil } - out := make(map[string]interface{}) + out := make(map[string]any) for mimeType, exampleStr := range in { switch mimeType { case "application/json": @@ -2714,7 +2714,7 @@ func protoJSONSchemaTypeToFormat(in []openapi_options.JSONSchema_JSONSchemaSimpl } } -func protoExternalDocumentationToOpenAPIExternalDocumentation(in *openapi_options.ExternalDocumentation, reg *descriptor.Registry, data interface{}) *openapiExternalDocumentationObject { +func protoExternalDocumentationToOpenAPIExternalDocumentation(in *openapi_options.ExternalDocumentation, reg *descriptor.Registry, data any) *openapiExternalDocumentationObject { if in == nil { return nil } diff --git a/protoc-gen-openapiv2/internal/genopenapi/template_test.go b/protoc-gen-openapiv2/internal/genopenapi/template_test.go index 94d75e3..c790765 100644 --- a/protoc-gen-openapiv2/internal/genopenapi/template_test.go +++ b/protoc-gen-openapiv2/internal/genopenapi/template_test.go @@ -3065,7 +3065,7 @@ func TestApplyTemplateProtobufAny(t *testing.T) { if err != nil { t.Errorf("protobufAny.Properties.MarshalJSON(), got error = %v", err) } - var anyPropsMap map[string]interface{} + var anyPropsMap map[string]any if err := json.Unmarshal(anyPropsJSON, &anyPropsMap); err != nil { t.Errorf("json.Unmarshal(), got error = %v", err) } @@ -5033,10 +5033,10 @@ func TestUpdateOpenAPIDataFromComments(t *testing.T) { tests := []struct { descr string - openapiSwaggerObject interface{} + openapiSwaggerObject any comments string expectedError error - expectedOpenAPIObject interface{} + expectedOpenAPIObject any useGoTemplate bool }{ { diff --git a/protoc-gen-openapiv2/internal/genopenapi/types.go b/protoc-gen-openapiv2/internal/genopenapi/types.go index ae9ba33..99661d5 100644 --- a/protoc-gen-openapiv2/internal/genopenapi/types.go +++ b/protoc-gen-openapiv2/internal/genopenapi/types.go @@ -197,7 +197,7 @@ func (m *RawExample) UnmarshalJSON(data []byte) error { // by types to customize their behavior when being marshaled into a YAML // document. The returned value is marshaled in place of the original // value implementing Marshaler. -func (e RawExample) MarshalYAML() (interface{}, error) { +func (e RawExample) MarshalYAML() (any, error) { // From docs, json.Unmarshal will store one of next types to data: // - bool, for JSON booleans; // - float64, for JSON numbers; @@ -205,7 +205,7 @@ func (e RawExample) MarshalYAML() (interface{}, error) { // - []interface{}, for JSON arrays; // - map[string]interface{}, for JSON objects; // - nil for JSON null. - var data interface{} + var data any if err := json.Unmarshal(e, &data); err != nil { return nil, err } @@ -229,10 +229,10 @@ type openapiResponsesObject map[string]openapiResponseObject // http://swagger.io/specification/#responseObject type openapiResponseObject struct { - Description string `json:"description" yaml:"description"` - Schema openapiSchemaObject `json:"schema" yaml:"schema"` - Examples map[string]interface{} `json:"examples,omitempty" yaml:"examples,omitempty"` - Headers openapiHeadersObject `json:"headers,omitempty" yaml:"headers,omitempty"` + Description string `json:"description" yaml:"description"` + Schema openapiSchemaObject `json:"schema" yaml:"schema"` + Examples map[string]any `json:"examples,omitempty" yaml:"examples,omitempty"` + Headers openapiHeadersObject `json:"headers,omitempty" yaml:"headers,omitempty"` extensions []extension `json:"-" yaml:"-"` } @@ -250,13 +250,13 @@ type openapiHeaderObject struct { type keyVal struct { Key string - Value interface{} + Value any } type openapiSchemaObjectProperties []keyVal -func (p openapiSchemaObjectProperties) MarshalYAML() (interface{}, error) { - m := make(map[string]interface{}, len(p)) +func (p openapiSchemaObjectProperties) MarshalYAML() (any, error) { + m := make(map[string]any, len(p)) for _, v := range p { m[v.Key] = v.Value diff --git a/protoc-gen-openapiv2/internal/genopenapi/types_test.go b/protoc-gen-openapiv2/internal/genopenapi/types_test.go index 849cfbf..63941da 100644 --- a/protoc-gen-openapiv2/internal/genopenapi/types_test.go +++ b/protoc-gen-openapiv2/internal/genopenapi/types_test.go @@ -66,7 +66,7 @@ func TestRawExample(t *testing.T) { func TestOpenapiSchemaObjectProperties(t *testing.T) { t.Parallel() - v := map[string]interface{}{ + v := map[string]any{ "example": openapiSchemaObjectProperties{{ Key: "test1", Value: 1, diff --git a/protoc-gen-openapiv2/options/annotations.pb.go b/protoc-gen-openapiv2/options/annotations.pb.go index 0ef620d..5738a85 100644 --- a/protoc-gen-openapiv2/options/annotations.pb.go +++ b/protoc-gen-openapiv2/options/annotations.pb.go @@ -179,7 +179,7 @@ var file_protoc_gen_openapiv2_options_annotations_proto_rawDesc = []byte{ 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } -var file_protoc_gen_openapiv2_options_annotations_proto_goTypes = []interface{}{ +var file_protoc_gen_openapiv2_options_annotations_proto_goTypes = []any{ (*descriptorpb.FileOptions)(nil), // 0: google.protobuf.FileOptions (*descriptorpb.MethodOptions)(nil), // 1: google.protobuf.MethodOptions (*descriptorpb.MessageOptions)(nil), // 2: google.protobuf.MessageOptions diff --git a/protoc-gen-openapiv2/options/openapiv2.pb.go b/protoc-gen-openapiv2/options/openapiv2.pb.go index 03c19a3..952ca3f 100644 --- a/protoc-gen-openapiv2/options/openapiv2.pb.go +++ b/protoc-gen-openapiv2/options/openapiv2.pb.go @@ -309,26 +309,25 @@ func (SecurityScheme_Flow) EnumDescriptor() ([]byte, []int) { // // Example: // -// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { -// info: { -// title: "Echo API"; -// version: "1.0"; -// description: ""; -// contact: { -// name: "gRPC-Gateway project"; -// url: "https://github.com/grpc-ecosystem/grpc-gateway"; -// email: "none@example.com"; -// }; -// license: { -// name: "BSD 3-Clause License"; -// url: "https://github.com/grpc-ecosystem/grpc-gateway/blob/master/LICENSE.txt"; -// }; -// }; -// schemes: HTTPS; -// consumes: "application/json"; -// produces: "application/json"; -// }; -// +// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { +// info: { +// title: "Echo API"; +// version: "1.0"; +// description: ""; +// contact: { +// name: "gRPC-Gateway project"; +// url: "https://github.com/grpc-ecosystem/grpc-gateway"; +// email: "none@example.com"; +// }; +// license: { +// name: "BSD 3-Clause License"; +// url: "https://github.com/grpc-ecosystem/grpc-gateway/blob/master/LICENSE.txt"; +// }; +// }; +// schemes: HTTPS; +// consumes: "application/json"; +// produces: "application/json"; +// }; type Swagger struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -505,25 +504,25 @@ func (x *Swagger) GetExtensions() map[string]*structpb.Value { // // Example: // -// service EchoService { -// rpc Echo(SimpleMessage) returns (SimpleMessage) { -// option (google.api.http) = { -// get: "/v1/example/echo/{id}" -// }; +// service EchoService { +// rpc Echo(SimpleMessage) returns (SimpleMessage) { +// option (google.api.http) = { +// get: "/v1/example/echo/{id}" +// }; // -// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { -// summary: "Get a message."; -// operation_id: "getMessage"; -// tags: "echo"; -// responses: { -// key: "200" -// value: { -// description: "OK"; -// } -// } -// }; -// } -// } +// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { +// summary: "Get a message."; +// operation_id: "getMessage"; +// tags: "echo"; +// responses: { +// key: "200" +// value: { +// description: "OK"; +// } +// } +// }; +// } +// } type Operation struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -691,7 +690,6 @@ func (x *Operation) GetExtensions() map[string]*structpb.Value { // `Header` is a representation of OpenAPI v2 specification's Header object. // // See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#headerObject -// type Header struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -781,7 +779,6 @@ func (x *Header) GetPattern() string { // `Response` is a representation of OpenAPI v2 specification's Response object. // // See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#responseObject -// type Response struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -876,24 +873,23 @@ func (x *Response) GetExtensions() map[string]*structpb.Value { // // Example: // -// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { -// info: { -// title: "Echo API"; -// version: "1.0"; -// description: ""; -// contact: { -// name: "gRPC-Gateway project"; -// url: "https://github.com/grpc-ecosystem/grpc-gateway"; -// email: "none@example.com"; -// }; -// license: { -// name: "BSD 3-Clause License"; -// url: "https://github.com/grpc-ecosystem/grpc-gateway/blob/master/LICENSE.txt"; -// }; -// }; -// ... -// }; -// +// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { +// info: { +// title: "Echo API"; +// version: "1.0"; +// description: ""; +// contact: { +// name: "gRPC-Gateway project"; +// url: "https://github.com/grpc-ecosystem/grpc-gateway"; +// email: "none@example.com"; +// }; +// license: { +// name: "BSD 3-Clause License"; +// url: "https://github.com/grpc-ecosystem/grpc-gateway/blob/master/LICENSE.txt"; +// }; +// }; +// ... +// }; type Info struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1003,19 +999,18 @@ func (x *Info) GetExtensions() map[string]*structpb.Value { // // Example: // -// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { -// info: { -// ... -// contact: { -// name: "gRPC-Gateway project"; -// url: "https://github.com/grpc-ecosystem/grpc-gateway"; -// email: "none@example.com"; -// }; -// ... -// }; -// ... -// }; -// +// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { +// info: { +// ... +// contact: { +// name: "gRPC-Gateway project"; +// url: "https://github.com/grpc-ecosystem/grpc-gateway"; +// email: "none@example.com"; +// }; +// ... +// }; +// ... +// }; type Contact struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1090,18 +1085,17 @@ func (x *Contact) GetEmail() string { // // Example: // -// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { -// info: { -// ... -// license: { -// name: "BSD 3-Clause License"; -// url: "https://github.com/grpc-ecosystem/grpc-gateway/blob/master/LICENSE.txt"; -// }; -// ... -// }; -// ... -// }; -// +// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { +// info: { +// ... +// license: { +// name: "BSD 3-Clause License"; +// url: "https://github.com/grpc-ecosystem/grpc-gateway/blob/master/LICENSE.txt"; +// }; +// ... +// }; +// ... +// }; type License struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1166,15 +1160,14 @@ func (x *License) GetUrl() string { // // Example: // -// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { -// ... -// external_docs: { -// description: "More about gRPC-Gateway"; -// url: "https://github.com/grpc-ecosystem/grpc-gateway"; -// } -// ... -// }; -// +// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { +// ... +// external_docs: { +// description: "More about gRPC-Gateway"; +// url: "https://github.com/grpc-ecosystem/grpc-gateway"; +// } +// ... +// }; type ExternalDocumentation struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1237,7 +1230,6 @@ func (x *ExternalDocumentation) GetUrl() string { // `Schema` is a representation of OpenAPI v2 specification's Schema object. // // See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#schemaObject -// type Schema struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1342,22 +1334,21 @@ func (x *Schema) GetExample() string { // // Example: // -// message SimpleMessage { -// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema) = { -// json_schema: { -// title: "SimpleMessage" -// description: "A simple message." -// required: ["id"] -// } -// }; -// -// // Id represents the message identifier. -// string id = 1; [ -// (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { -// description: "The unique identifier of the simple message." -// }]; -// } +// message SimpleMessage { +// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema) = { +// json_schema: { +// title: "SimpleMessage" +// description: "A simple message." +// required: ["id"] +// } +// }; // +// // Id represents the message identifier. +// string id = 1; [ +// (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { +// description: "The unique identifier of the simple message." +// }]; +// } type JSONSchema struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1627,7 +1618,6 @@ func (x *JSONSchema) GetExtensions() map[string]*structpb.Value { // `Tag` is a representation of OpenAPI v2 specification's Tag object. // // See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#tagObject -// type Tag struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2573,7 +2563,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_rawDescGZIP() []byte { var file_protoc_gen_openapiv2_options_openapiv2_proto_enumTypes = make([]protoimpl.EnumInfo, 5) var file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes = make([]protoimpl.MessageInfo, 30) -var file_protoc_gen_openapiv2_options_openapiv2_proto_goTypes = []interface{}{ +var file_protoc_gen_openapiv2_options_openapiv2_proto_goTypes = []any{ (Scheme)(0), // 0: grpc.gateway.protoc_gen_openapiv2.options.Scheme (JSONSchema_JSONSchemaSimpleTypes)(0), // 1: grpc.gateway.protoc_gen_openapiv2.options.JSONSchema.JSONSchemaSimpleTypes (SecurityScheme_Type)(0), // 2: grpc.gateway.protoc_gen_openapiv2.options.SecurityScheme.Type @@ -2669,7 +2659,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*Swagger); i { case 0: return &v.state @@ -2681,7 +2671,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*Operation); i { case 0: return &v.state @@ -2693,7 +2683,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*Header); i { case 0: return &v.state @@ -2705,7 +2695,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*Response); i { case 0: return &v.state @@ -2717,7 +2707,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*Info); i { case 0: return &v.state @@ -2729,7 +2719,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*Contact); i { case 0: return &v.state @@ -2741,7 +2731,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*License); i { case 0: return &v.state @@ -2753,7 +2743,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*ExternalDocumentation); i { case 0: return &v.state @@ -2765,7 +2755,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*Schema); i { case 0: return &v.state @@ -2777,7 +2767,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*JSONSchema); i { case 0: return &v.state @@ -2789,7 +2779,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*Tag); i { case 0: return &v.state @@ -2801,7 +2791,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*SecurityDefinitions); i { case 0: return &v.state @@ -2813,7 +2803,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*SecurityScheme); i { case 0: return &v.state @@ -2825,7 +2815,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*SecurityRequirement); i { case 0: return &v.state @@ -2837,7 +2827,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*Scopes); i { case 0: return &v.state @@ -2849,7 +2839,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[23].Exporter = func(v any, i int) any { switch v := v.(*JSONSchema_FieldConfiguration); i { case 0: return &v.state @@ -2861,7 +2851,7 @@ func file_protoc_gen_openapiv2_options_openapiv2_proto_init() { return nil } } - file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + file_protoc_gen_openapiv2_options_openapiv2_proto_msgTypes[27].Exporter = func(v any, i int) any { switch v := v.(*SecurityRequirement_SecurityRequirementValue); i { case 0: return &v.state diff --git a/runtime/fieldmask.go b/runtime/fieldmask.go index 82ab3d2..c1e3486 100644 --- a/runtime/fieldmask.go +++ b/runtime/fieldmask.go @@ -23,7 +23,7 @@ func getFieldByName(fields protoreflect.FieldDescriptors, name string) protorefl // FieldMaskFromRequestBody creates a FieldMask printing all complete paths from the JSON body. func FieldMaskFromRequestBody(r io.Reader, msg proto.Message) (*field_mask.FieldMask, error) { fm := &field_mask.FieldMask{} - var root interface{} + var root any if err := json.NewDecoder(r).Decode(&root); err != nil { if err == io.EOF { @@ -38,7 +38,7 @@ func FieldMaskFromRequestBody(r io.Reader, msg proto.Message) (*field_mask.Field item := queue[0] queue = queue[1:] - m, ok := item.node.(map[string]interface{}) + m, ok := item.node.(map[string]any) switch { case ok: // if the item is an object, then enqueue all of its children @@ -64,7 +64,7 @@ func FieldMaskFromRequestBody(r io.Reader, msg proto.Message) (*field_mask.Field } if isProtobufAnyMessage(fd.Message()) { - _, hasTypeField := v.(map[string]interface{})["@type"] + _, hasTypeField := v.(map[string]any)["@type"] if hasTypeField { queue = append(queue, fieldMaskPathItem{path: k}) continue @@ -121,8 +121,8 @@ func isDynamicProtoMessage(md protoreflect.MessageDescriptor) bool { // the unmarshalled json contained within in. // Returns a slice containing all subpaths with the root at the // passed in name and json value. -func buildPathsBlindly(name string, in interface{}) []string { - m, ok := in.(map[string]interface{}) +func buildPathsBlindly(name string, in any) []string { + m, ok := in.(map[string]any) if !ok { return []string{name} } @@ -133,14 +133,14 @@ func buildPathsBlindly(name string, in interface{}) []string { cur := queue[0] queue = queue[1:] - m, ok := cur.node.(map[string]interface{}) + m, ok := cur.node.(map[string]any) if !ok { // This should never happen since we should always check that we only add // nodes of type map[string]interface{} to the queue. continue } for k, v := range m { - if mi, ok := v.(map[string]interface{}); ok { + if mi, ok := v.(map[string]any); ok { queue = append(queue, fieldMaskPathItem{path: cur.path + "." + k, node: mi}) } else { // This is not a struct, so there are no more levels to descend. @@ -158,7 +158,7 @@ type fieldMaskPathItem struct { path string // a generic decoded json object the current item to inspect for further path extraction - node interface{} + node any // parent message msg protoreflect.Message diff --git a/runtime/handler.go b/runtime/handler.go index 72080c5..5c855d8 100644 --- a/runtime/handler.go +++ b/runtime/handler.go @@ -72,7 +72,7 @@ func ForwardResponseStream(ctx context.Context, mux *ServeMux, marshaler Marshal case isHTTPBody: buf = httpBody.GetData() default: - result := map[string]interface{}{"result": resp} + result := map[string]any{"result": resp} if rb, ok := resp.(responseBody); ok { result["result"] = rb.XXX_ResponseBody() } @@ -127,7 +127,7 @@ func handleForwardResponseTrailer(w http.ResponseWriter, md ServerMetadata) { // responseBody interface contains method for getting field for marshaling to the response body // this method is generated for response struct from the value of `response_body` in the `google.api.HttpRule` type responseBody interface { - XXX_ResponseBody() interface{} + XXX_ResponseBody() any } // ForwardResponseMessage forwards the message "resp" from gRPC server to REST client. diff --git a/runtime/handler_test.go b/runtime/handler_test.go index 3755cd3..7bdc0a6 100644 --- a/runtime/handler_test.go +++ b/runtime/handler_test.go @@ -20,7 +20,7 @@ type fakeReponseBodyWrapper struct { } // XXX_ResponseBody returns id of SimpleMessage -func (r fakeReponseBodyWrapper) XXX_ResponseBody() interface{} { +func (r fakeReponseBodyWrapper) XXX_ResponseBody() any { resp := r.Message.(*pb.SimpleMessage) return resp.Id } @@ -146,9 +146,9 @@ func TestForwardResponseStream(t *testing.T) { t.Errorf("stream responseBody failed %v", err) } - b, err = marshaler.Marshal(map[string]interface{}{"result": rb.XXX_ResponseBody()}) + b, err = marshaler.Marshal(map[string]any{"result": rb.XXX_ResponseBody()}) } else { - b, err = marshaler.Marshal(map[string]interface{}{"result": msg.pb}) + b, err = marshaler.Marshal(map[string]any{"result": msg.pb}) } if err != nil { @@ -170,11 +170,11 @@ type CustomMarshaler struct { m *runtime.JSONPb } -func (c *CustomMarshaler) Marshal(v interface{}) ([]byte, error) { return c.m.Marshal(v) } -func (c *CustomMarshaler) Unmarshal(data []byte, v interface{}) error { return c.m.Unmarshal(data, v) } -func (c *CustomMarshaler) NewDecoder(r io.Reader) runtime.Decoder { return c.m.NewDecoder(r) } -func (c *CustomMarshaler) NewEncoder(w io.Writer) runtime.Encoder { return c.m.NewEncoder(w) } -func (c *CustomMarshaler) ContentType(v interface{}) string { return "Custom-Content-Type" } +func (c *CustomMarshaler) Marshal(v any) ([]byte, error) { return c.m.Marshal(v) } +func (c *CustomMarshaler) Unmarshal(data []byte, v any) error { return c.m.Unmarshal(data, v) } +func (c *CustomMarshaler) NewDecoder(r io.Reader) runtime.Decoder { return c.m.NewDecoder(r) } +func (c *CustomMarshaler) NewEncoder(w io.Writer) runtime.Encoder { return c.m.NewEncoder(w) } +func (c *CustomMarshaler) ContentType(v any) string { return "Custom-Content-Type" } func TestForwardResponseStreamCustomMarshaler(t *testing.T) { type msg struct { diff --git a/runtime/internal/examplepb/example.pb.go b/runtime/internal/examplepb/example.pb.go index bcbe335..cf3b6c3 100644 --- a/runtime/internal/examplepb/example.pb.go +++ b/runtime/internal/examplepb/example.pb.go @@ -1424,7 +1424,7 @@ func file_runtime_internal_examplepb_example_proto_rawDescGZIP() []byte { var file_runtime_internal_examplepb_example_proto_enumTypes = make([]protoimpl.EnumInfo, 3) var file_runtime_internal_examplepb_example_proto_msgTypes = make([]protoimpl.MessageInfo, 16) -var file_runtime_internal_examplepb_example_proto_goTypes = []interface{}{ +var file_runtime_internal_examplepb_example_proto_goTypes = []any{ (NumericEnum)(0), // 0: grpc.gateway.runtime.internal.examplepb.NumericEnum (ABitOfEverything_Nested_DeepEnum)(0), // 1: grpc.gateway.runtime.internal.examplepb.ABitOfEverything.Nested.DeepEnum (RepeatedResponseBodyOut_Response_ResponseType)(0), // 2: grpc.gateway.runtime.internal.examplepb.RepeatedResponseBodyOut.Response.ResponseType @@ -1490,7 +1490,7 @@ func file_runtime_internal_examplepb_example_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_runtime_internal_examplepb_example_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_example_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*SimpleMessage); i { case 0: return &v.state @@ -1502,7 +1502,7 @@ func file_runtime_internal_examplepb_example_proto_init() { return nil } } - file_runtime_internal_examplepb_example_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_example_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ABitOfEverything); i { case 0: return &v.state @@ -1514,7 +1514,7 @@ func file_runtime_internal_examplepb_example_proto_init() { return nil } } - file_runtime_internal_examplepb_example_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_example_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ResponseBodyOut); i { case 0: return &v.state @@ -1526,7 +1526,7 @@ func file_runtime_internal_examplepb_example_proto_init() { return nil } } - file_runtime_internal_examplepb_example_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_example_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*RepeatedResponseBodyOut); i { case 0: return &v.state @@ -1538,7 +1538,7 @@ func file_runtime_internal_examplepb_example_proto_init() { return nil } } - file_runtime_internal_examplepb_example_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_example_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*UpdateMessage); i { case 0: return &v.state @@ -1550,7 +1550,7 @@ func file_runtime_internal_examplepb_example_proto_init() { return nil } } - file_runtime_internal_examplepb_example_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_example_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*NestedOuter); i { case 0: return &v.state @@ -1562,7 +1562,7 @@ func file_runtime_internal_examplepb_example_proto_init() { return nil } } - file_runtime_internal_examplepb_example_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_example_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*NestedOne); i { case 0: return &v.state @@ -1574,7 +1574,7 @@ func file_runtime_internal_examplepb_example_proto_init() { return nil } } - file_runtime_internal_examplepb_example_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_example_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*NestedTwo); i { case 0: return &v.state @@ -1586,7 +1586,7 @@ func file_runtime_internal_examplepb_example_proto_init() { return nil } } - file_runtime_internal_examplepb_example_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_example_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*NestedThree); i { case 0: return &v.state @@ -1598,7 +1598,7 @@ func file_runtime_internal_examplepb_example_proto_init() { return nil } } - file_runtime_internal_examplepb_example_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_example_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*UpdateNestedRequest); i { case 0: return &v.state @@ -1610,7 +1610,7 @@ func file_runtime_internal_examplepb_example_proto_init() { return nil } } - file_runtime_internal_examplepb_example_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_example_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*ABitOfEverything_Nested); i { case 0: return &v.state @@ -1622,7 +1622,7 @@ func file_runtime_internal_examplepb_example_proto_init() { return nil } } - file_runtime_internal_examplepb_example_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_example_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*ResponseBodyOut_Response); i { case 0: return &v.state @@ -1634,7 +1634,7 @@ func file_runtime_internal_examplepb_example_proto_init() { return nil } } - file_runtime_internal_examplepb_example_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_example_proto_msgTypes[15].Exporter = func(v any, i int) any { switch v := v.(*RepeatedResponseBodyOut_Response); i { case 0: return &v.state @@ -1647,7 +1647,7 @@ func file_runtime_internal_examplepb_example_proto_init() { } } } - file_runtime_internal_examplepb_example_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_runtime_internal_examplepb_example_proto_msgTypes[1].OneofWrappers = []any{ (*ABitOfEverything_OneofEmpty)(nil), (*ABitOfEverything_OneofString)(nil), } diff --git a/runtime/internal/examplepb/non_standard_names.pb.go b/runtime/internal/examplepb/non_standard_names.pb.go index 024be96..95108ad 100644 --- a/runtime/internal/examplepb/non_standard_names.pb.go +++ b/runtime/internal/examplepb/non_standard_names.pb.go @@ -719,7 +719,7 @@ func file_runtime_internal_examplepb_non_standard_names_proto_rawDescGZIP() []by } var file_runtime_internal_examplepb_non_standard_names_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_runtime_internal_examplepb_non_standard_names_proto_goTypes = []interface{}{ +var file_runtime_internal_examplepb_non_standard_names_proto_goTypes = []any{ (*NonStandardMessage)(nil), // 0: grpc.gateway.runtime.internal.examplepb.NonStandardMessage (*NonStandardUpdateRequest)(nil), // 1: grpc.gateway.runtime.internal.examplepb.NonStandardUpdateRequest (*NonStandardMessageWithJSONNames)(nil), // 2: grpc.gateway.runtime.internal.examplepb.NonStandardMessageWithJSONNames @@ -762,7 +762,7 @@ func file_runtime_internal_examplepb_non_standard_names_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*NonStandardMessage); i { case 0: return &v.state @@ -774,7 +774,7 @@ func file_runtime_internal_examplepb_non_standard_names_proto_init() { return nil } } - file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*NonStandardUpdateRequest); i { case 0: return &v.state @@ -786,7 +786,7 @@ func file_runtime_internal_examplepb_non_standard_names_proto_init() { return nil } } - file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*NonStandardMessageWithJSONNames); i { case 0: return &v.state @@ -798,7 +798,7 @@ func file_runtime_internal_examplepb_non_standard_names_proto_init() { return nil } } - file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*NonStandardWithJSONNamesUpdateRequest); i { case 0: return &v.state @@ -810,7 +810,7 @@ func file_runtime_internal_examplepb_non_standard_names_proto_init() { return nil } } - file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*NonStandardMessage_Thing); i { case 0: return &v.state @@ -822,7 +822,7 @@ func file_runtime_internal_examplepb_non_standard_names_proto_init() { return nil } } - file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*NonStandardMessage_Thing_SubThing); i { case 0: return &v.state @@ -834,7 +834,7 @@ func file_runtime_internal_examplepb_non_standard_names_proto_init() { return nil } } - file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*NonStandardMessageWithJSONNames_Thing); i { case 0: return &v.state @@ -846,7 +846,7 @@ func file_runtime_internal_examplepb_non_standard_names_proto_init() { return nil } } - file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_non_standard_names_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*NonStandardMessageWithJSONNames_Thing_SubThing); i { case 0: return &v.state diff --git a/runtime/internal/examplepb/non_standard_names_grpc.pb.go b/runtime/internal/examplepb/non_standard_names_grpc.pb.go index 545ead3..d517b0a 100644 --- a/runtime/internal/examplepb/non_standard_names_grpc.pb.go +++ b/runtime/internal/examplepb/non_standard_names_grpc.pb.go @@ -82,7 +82,7 @@ func RegisterNonStandardServiceServer(s grpc.ServiceRegistrar, srv NonStandardSe s.RegisterService(&NonStandardService_ServiceDesc, srv) } -func _NonStandardService_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _NonStandardService_Update_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(NonStandardUpdateRequest) if err := dec(in); err != nil { return nil, err @@ -94,13 +94,13 @@ func _NonStandardService_Update_Handler(srv interface{}, ctx context.Context, de Server: srv, FullMethod: "/grpc.gateway.runtime.internal.examplepb.NonStandardService/Update", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(NonStandardServiceServer).Update(ctx, req.(*NonStandardUpdateRequest)) } return interceptor(ctx, in, info, handler) } -func _NonStandardService_UpdateWithJSONNames_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _NonStandardService_UpdateWithJSONNames_Handler(srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor) (any, error) { in := new(NonStandardWithJSONNamesUpdateRequest) if err := dec(in); err != nil { return nil, err @@ -112,7 +112,7 @@ func _NonStandardService_UpdateWithJSONNames_Handler(srv interface{}, ctx contex Server: srv, FullMethod: "/grpc.gateway.runtime.internal.examplepb.NonStandardService/UpdateWithJSONNames", } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { + handler := func(ctx context.Context, req any) (any, error) { return srv.(NonStandardServiceServer).UpdateWithJSONNames(ctx, req.(*NonStandardWithJSONNamesUpdateRequest)) } return interceptor(ctx, in, info, handler) diff --git a/runtime/internal/examplepb/proto2.pb.go b/runtime/internal/examplepb/proto2.pb.go index 7a10328..7cbc32f 100644 --- a/runtime/internal/examplepb/proto2.pb.go +++ b/runtime/internal/examplepb/proto2.pb.go @@ -190,7 +190,7 @@ func file_runtime_internal_examplepb_proto2_proto_rawDescGZIP() []byte { } var file_runtime_internal_examplepb_proto2_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_runtime_internal_examplepb_proto2_proto_goTypes = []interface{}{ +var file_runtime_internal_examplepb_proto2_proto_goTypes = []any{ (*Proto2Message)(nil), // 0: grpc.gateway.runtime.internal.examplepb.Proto2Message } var file_runtime_internal_examplepb_proto2_proto_depIdxs = []int32{ @@ -207,7 +207,7 @@ func file_runtime_internal_examplepb_proto2_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_runtime_internal_examplepb_proto2_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_proto2_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*Proto2Message); i { case 0: return &v.state diff --git a/runtime/internal/examplepb/proto3.pb.go b/runtime/internal/examplepb/proto3.pb.go index a607139..ff662fc 100644 --- a/runtime/internal/examplepb/proto3.pb.go +++ b/runtime/internal/examplepb/proto3.pb.go @@ -829,7 +829,7 @@ func file_runtime_internal_examplepb_proto3_proto_rawDescGZIP() []byte { var file_runtime_internal_examplepb_proto3_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_runtime_internal_examplepb_proto3_proto_msgTypes = make([]protoimpl.MessageInfo, 15) -var file_runtime_internal_examplepb_proto3_proto_goTypes = []interface{}{ +var file_runtime_internal_examplepb_proto3_proto_goTypes = []any{ (EnumValue)(0), // 0: grpc.gateway.runtime.internal.examplepb.EnumValue (*Proto3Message)(nil), // 1: grpc.gateway.runtime.internal.examplepb.Proto3Message nil, // 2: grpc.gateway.runtime.internal.examplepb.Proto3Message.MapValueEntry @@ -909,7 +909,7 @@ func file_runtime_internal_examplepb_proto3_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_runtime_internal_examplepb_proto3_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_runtime_internal_examplepb_proto3_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*Proto3Message); i { case 0: return &v.state @@ -922,7 +922,7 @@ func file_runtime_internal_examplepb_proto3_proto_init() { } } } - file_runtime_internal_examplepb_proto3_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_runtime_internal_examplepb_proto3_proto_msgTypes[0].OneofWrappers = []any{ (*Proto3Message_OneofBoolValue)(nil), (*Proto3Message_OneofStringValue)(nil), (*Proto3Message_NestedOneofValueOne)(nil), diff --git a/runtime/marshal_httpbodyproto.go b/runtime/marshal_httpbodyproto.go index b86135c..ba3eba8 100644 --- a/runtime/marshal_httpbodyproto.go +++ b/runtime/marshal_httpbodyproto.go @@ -15,7 +15,7 @@ type HTTPBodyMarshaler struct { // ContentType returns its specified content type in case v is a // google.api.HttpBody message, otherwise it will fall back to the default Marshalers // content type. -func (h *HTTPBodyMarshaler) ContentType(v interface{}) string { +func (h *HTTPBodyMarshaler) ContentType(v any) string { if httpBody, ok := v.(*httpbody.HttpBody); ok { return httpBody.GetContentType() } @@ -24,7 +24,7 @@ func (h *HTTPBodyMarshaler) ContentType(v interface{}) string { // Marshal marshals "v" by returning the body bytes if v is a // google.api.HttpBody message, otherwise it falls back to the default Marshaler. -func (h *HTTPBodyMarshaler) Marshal(v interface{}) ([]byte, error) { +func (h *HTTPBodyMarshaler) Marshal(v any) ([]byte, error) { if httpBody, ok := v.(*httpbody.HttpBody); ok { return httpBody.Data, nil } diff --git a/runtime/marshal_json.go b/runtime/marshal_json.go index d6aa825..3c4c8ee 100644 --- a/runtime/marshal_json.go +++ b/runtime/marshal_json.go @@ -15,17 +15,17 @@ import ( type JSONBuiltin struct{} // ContentType always Returns "application/json". -func (*JSONBuiltin) ContentType(_ interface{}) string { +func (*JSONBuiltin) ContentType(_ any) string { return "application/json" } // Marshal marshals "v" into JSON -func (j *JSONBuiltin) Marshal(v interface{}) ([]byte, error) { +func (j *JSONBuiltin) Marshal(v any) ([]byte, error) { return json.Marshal(v) } // Unmarshal unmarshals JSON data into "v". -func (j *JSONBuiltin) Unmarshal(data []byte, v interface{}) error { +func (j *JSONBuiltin) Unmarshal(data []byte, v any) error { return json.Unmarshal(data, v) } diff --git a/runtime/marshal_json_test.go b/runtime/marshal_json_test.go index 5037aea..f602a3a 100644 --- a/runtime/marshal_json_test.go +++ b/runtime/marshal_json_test.go @@ -99,7 +99,7 @@ func TestJSONBuiltinUnmarshalField(t *testing.T) { func alloc(t reflect.Type) reflect.Value { if t == nil { - return reflect.ValueOf(new(interface{})) + return reflect.ValueOf(new(any)) } else { return reflect.New(t) } @@ -191,7 +191,7 @@ func TestJSONBuiltinDecoderFields(t *testing.T) { var ( builtinFieldFixtures = []struct { - data interface{} + data any json string }{ {data: "", json: `""`}, @@ -219,9 +219,9 @@ var ( {data: examplepb.NumericEnum_ONE, json: "1"}, {data: nil, json: "null"}, {data: (*string)(nil), json: "null"}, - {data: []interface{}{nil, "foo", -1.0, 1.234, true}, json: `[null,"foo",-1,1.234,true]`}, + {data: []any{nil, "foo", -1.0, 1.234, true}, json: `[null,"foo",-1,1.234,true]`}, { - data: map[string]interface{}{"bar": nil, "baz": -1.0, "fiz": 1.234, "foo": true}, + data: map[string]any{"bar": nil, "baz": -1.0, "fiz": 1.234, "foo": true}, json: `{"bar":null,"baz":-1,"fiz":1.234,"foo":true}`, }, { @@ -230,7 +230,7 @@ var ( }, } builtinKnownErrors = []struct { - data interface{} + data any json string }{ {data: examplepb.NumericEnum_ONE, json: "ONE"}, diff --git a/runtime/marshal_jsonpb.go b/runtime/marshal_jsonpb.go index 524ea05..6ca848e 100644 --- a/runtime/marshal_jsonpb.go +++ b/runtime/marshal_jsonpb.go @@ -24,12 +24,12 @@ type JSONPb struct { } // ContentType always returns "application/json". -func (*JSONPb) ContentType(_ interface{}) string { +func (*JSONPb) ContentType(_ any) string { return "application/json" } // Marshal marshals "v" into JSON. -func (j *JSONPb) Marshal(v interface{}) ([]byte, error) { +func (j *JSONPb) Marshal(v any) ([]byte, error) { if _, ok := v.(proto.Message); !ok { return j.marshalNonProtoField(v) } @@ -41,7 +41,7 @@ func (j *JSONPb) Marshal(v interface{}) ([]byte, error) { return buf.Bytes(), nil } -func (j *JSONPb) marshalTo(w io.Writer, v interface{}) error { +func (j *JSONPb) marshalTo(w io.Writer, v any) error { p, ok := v.(proto.Message) if !ok { buf, err := j.marshalNonProtoField(v) @@ -70,7 +70,7 @@ var ( // it is only capable of marshaling non-message field values of protobuf, // i.e. primitive types, enums; pointers to primitives or enums; maps from // integer/string types to primitives/enums/pointers to messages. -func (j *JSONPb) marshalNonProtoField(v interface{}) ([]byte, error) { +func (j *JSONPb) marshalNonProtoField(v any) ([]byte, error) { if v == nil { return []byte("null"), nil } @@ -167,7 +167,7 @@ func (j *JSONPb) marshalNonProtoField(v interface{}) ([]byte, error) { } // Unmarshal unmarshals JSON "data" into "v" -func (j *JSONPb) Unmarshal(data []byte, v interface{}) error { +func (j *JSONPb) Unmarshal(data []byte, v any) error { return unmarshalJSONPb(data, j.UnmarshalOptions, v) } @@ -189,13 +189,13 @@ type DecoderWrapper struct { // Decode wraps the embedded decoder's Decode method to support // protos using a jsonpb.Unmarshaler. -func (d DecoderWrapper) Decode(v interface{}) error { +func (d DecoderWrapper) Decode(v any) error { return decodeJSONPb(d.Decoder, d.UnmarshalOptions, v) } // NewEncoder returns an Encoder which writes JSON stream into "w". func (j *JSONPb) NewEncoder(w io.Writer) Encoder { - return EncoderFunc(func(v interface{}) error { + return EncoderFunc(func(v any) error { if err := j.marshalTo(w, v); err != nil { return err } @@ -206,12 +206,12 @@ func (j *JSONPb) NewEncoder(w io.Writer) Encoder { }) } -func unmarshalJSONPb(data []byte, unmarshaler protojson.UnmarshalOptions, v interface{}) error { +func unmarshalJSONPb(data []byte, unmarshaler protojson.UnmarshalOptions, v any) error { d := json.NewDecoder(bytes.NewReader(data)) return decodeJSONPb(d, unmarshaler, v) } -func decodeJSONPb(d *json.Decoder, unmarshaler protojson.UnmarshalOptions, v interface{}) error { +func decodeJSONPb(d *json.Decoder, unmarshaler protojson.UnmarshalOptions, v any) error { p, ok := v.(proto.Message) if !ok { return decodeNonProtoField(d, unmarshaler, v) @@ -227,7 +227,7 @@ func decodeJSONPb(d *json.Decoder, unmarshaler protojson.UnmarshalOptions, v int return unmarshaler.Unmarshal([]byte(b), p) } -func decodeNonProtoField(d *json.Decoder, unmarshaler protojson.UnmarshalOptions, v interface{}) error { +func decodeNonProtoField(d *json.Decoder, unmarshaler protojson.UnmarshalOptions, v any) error { rv := reflect.ValueOf(v) if rv.Kind() != reflect.Ptr { return fmt.Errorf("%T is not a pointer", v) @@ -308,7 +308,7 @@ func decodeNonProtoField(d *json.Decoder, unmarshaler protojson.UnmarshalOptions return nil } if _, ok := rv.Interface().(protoEnum); ok { - var repr interface{} + var repr any if err := d.Decode(&repr); err != nil { return err } diff --git a/runtime/marshal_jsonpb_test.go b/runtime/marshal_jsonpb_test.go index d82290c..1de8707 100644 --- a/runtime/marshal_jsonpb_test.go +++ b/runtime/marshal_jsonpb_test.go @@ -510,7 +510,7 @@ func TestJSONPbDecoderUnknownField(t *testing.T) { var ( fieldFixtures = []struct { - data interface{} + data any json string skipUnmarshal bool }{ @@ -669,7 +669,7 @@ var ( ) func TestJSONPbUnmarshalNullField(t *testing.T) { - var out map[string]interface{} + var out map[string]any const json = `{"foo": null}` marshaler := &runtime.JSONPb{} @@ -689,15 +689,15 @@ func TestJSONPbUnmarshalNullField(t *testing.T) { func TestJSONPbMarshalResponseBodies(t *testing.T) { marshaler := &runtime.JSONPb{} for i, spec := range []struct { - input interface{} + input any emitUnpopulated bool - verifier func(*testing.T, interface{}, []byte) + verifier func(*testing.T, any, []byte) }{ { input: &examplepb.ResponseBodyOut{ Response: &examplepb.ResponseBodyOut_Response{Data: "abcdef"}, }, - verifier: func(t *testing.T, input interface{}, json []byte) { + verifier: func(t *testing.T, input any, json []byte) { var out examplepb.ResponseBodyOut err := marshaler.Unmarshal(json, &out) if err != nil { @@ -712,7 +712,7 @@ func TestJSONPbMarshalResponseBodies(t *testing.T) { { emitUnpopulated: true, input: &examplepb.ResponseBodyOut{}, - verifier: func(t *testing.T, input interface{}, json []byte) { + verifier: func(t *testing.T, input any, json []byte) { var out examplepb.ResponseBodyOut err := marshaler.Unmarshal(json, &out) if err != nil { @@ -726,7 +726,7 @@ func TestJSONPbMarshalResponseBodies(t *testing.T) { }, { input: &examplepb.RepeatedResponseBodyOut_Response{}, - verifier: func(t *testing.T, input interface{}, json []byte) { + verifier: func(t *testing.T, input any, json []byte) { var out examplepb.RepeatedResponseBodyOut_Response err := marshaler.Unmarshal(json, &out) if err != nil { @@ -741,7 +741,7 @@ func TestJSONPbMarshalResponseBodies(t *testing.T) { { emitUnpopulated: true, input: &examplepb.RepeatedResponseBodyOut_Response{}, - verifier: func(t *testing.T, input interface{}, json []byte) { + verifier: func(t *testing.T, input any, json []byte) { var out examplepb.RepeatedResponseBodyOut_Response err := marshaler.Unmarshal(json, &out) if err != nil { @@ -755,7 +755,7 @@ func TestJSONPbMarshalResponseBodies(t *testing.T) { }, { input: ([]*examplepb.RepeatedResponseBodyOut_Response)(nil), - verifier: func(t *testing.T, input interface{}, json []byte) { + verifier: func(t *testing.T, input any, json []byte) { var out []*examplepb.RepeatedResponseBodyOut_Response err := marshaler.Unmarshal(json, &out) if err != nil { @@ -770,7 +770,7 @@ func TestJSONPbMarshalResponseBodies(t *testing.T) { { emitUnpopulated: true, input: ([]*examplepb.RepeatedResponseBodyOut_Response)(nil), - verifier: func(t *testing.T, _ interface{}, json []byte) { + verifier: func(t *testing.T, _ any, json []byte) { var out []*examplepb.RepeatedResponseBodyOut_Response err := marshaler.Unmarshal(json, &out) if err != nil { @@ -784,7 +784,7 @@ func TestJSONPbMarshalResponseBodies(t *testing.T) { }, { input: []*examplepb.RepeatedResponseBodyOut_Response{}, - verifier: func(t *testing.T, input interface{}, json []byte) { + verifier: func(t *testing.T, input any, json []byte) { var out []*examplepb.RepeatedResponseBodyOut_Response err := marshaler.Unmarshal(json, &out) if err != nil { @@ -798,7 +798,7 @@ func TestJSONPbMarshalResponseBodies(t *testing.T) { }, { input: []string{"something"}, - verifier: func(t *testing.T, input interface{}, json []byte) { + verifier: func(t *testing.T, input any, json []byte) { var out []string err := marshaler.Unmarshal(json, &out) if err != nil { @@ -812,7 +812,7 @@ func TestJSONPbMarshalResponseBodies(t *testing.T) { }, { input: []string{}, - verifier: func(t *testing.T, input interface{}, json []byte) { + verifier: func(t *testing.T, input any, json []byte) { var out []string err := marshaler.Unmarshal(json, &out) if err != nil { @@ -826,7 +826,7 @@ func TestJSONPbMarshalResponseBodies(t *testing.T) { }, { input: ([]string)(nil), - verifier: func(t *testing.T, input interface{}, json []byte) { + verifier: func(t *testing.T, input any, json []byte) { var out []string err := marshaler.Unmarshal(json, &out) if err != nil { @@ -841,7 +841,7 @@ func TestJSONPbMarshalResponseBodies(t *testing.T) { { emitUnpopulated: true, input: ([]string)(nil), - verifier: func(t *testing.T, _ interface{}, json []byte) { + verifier: func(t *testing.T, _ any, json []byte) { var out []string err := marshaler.Unmarshal(json, &out) if err != nil { @@ -861,7 +861,7 @@ func TestJSONPbMarshalResponseBodies(t *testing.T) { Type: examplepb.RepeatedResponseBodyOut_Response_A, }, }, - verifier: func(t *testing.T, input interface{}, json []byte) { + verifier: func(t *testing.T, input any, json []byte) { var out []*examplepb.RepeatedResponseBodyOut_Response err := marshaler.Unmarshal(json, &out) if err != nil { @@ -882,7 +882,7 @@ func TestJSONPbMarshalResponseBodies(t *testing.T) { Type: examplepb.RepeatedResponseBodyOut_Response_B, }, }, - verifier: func(t *testing.T, input interface{}, json []byte) { + verifier: func(t *testing.T, input any, json []byte) { var out []*examplepb.RepeatedResponseBodyOut_Response err := marshaler.Unmarshal(json, &out) if err != nil { diff --git a/runtime/marshal_proto.go b/runtime/marshal_proto.go index 007f8f1..bb92da6 100644 --- a/runtime/marshal_proto.go +++ b/runtime/marshal_proto.go @@ -13,12 +13,12 @@ import ( type ProtoMarshaller struct{} // ContentType always returns "application/octet-stream". -func (*ProtoMarshaller) ContentType(_ interface{}) string { +func (*ProtoMarshaller) ContentType(_ any) string { return "application/octet-stream" } // Marshal marshals "value" into Proto -func (*ProtoMarshaller) Marshal(value interface{}) ([]byte, error) { +func (*ProtoMarshaller) Marshal(value any) ([]byte, error) { message, ok := value.(proto.Message) if !ok { return nil, errors.New("unable to marshal non proto field") @@ -27,7 +27,7 @@ func (*ProtoMarshaller) Marshal(value interface{}) ([]byte, error) { } // Unmarshal unmarshals proto "data" into "value" -func (*ProtoMarshaller) Unmarshal(data []byte, value interface{}) error { +func (*ProtoMarshaller) Unmarshal(data []byte, value any) error { message, ok := value.(proto.Message) if !ok { return errors.New("unable to unmarshal non proto field") @@ -37,7 +37,7 @@ func (*ProtoMarshaller) Unmarshal(data []byte, value interface{}) error { // NewDecoder returns a Decoder which reads proto stream from "reader". func (marshaller *ProtoMarshaller) NewDecoder(reader io.Reader) Decoder { - return DecoderFunc(func(value interface{}) error { + return DecoderFunc(func(value any) error { buffer, err := ioutil.ReadAll(reader) if err != nil { return err @@ -48,7 +48,7 @@ func (marshaller *ProtoMarshaller) NewDecoder(reader io.Reader) Decoder { // NewEncoder returns an Encoder which writes proto stream into "writer". func (marshaller *ProtoMarshaller) NewEncoder(writer io.Writer) Encoder { - return EncoderFunc(func(value interface{}) error { + return EncoderFunc(func(value any) error { buffer, err := marshaller.Marshal(value) if err != nil { return err diff --git a/runtime/marshaler.go b/runtime/marshaler.go index 2c0d25f..1f98923 100644 --- a/runtime/marshaler.go +++ b/runtime/marshaler.go @@ -7,10 +7,10 @@ import ( // Marshaler defines a conversion between byte sequence and gRPC payloads / fields. type Marshaler interface { // Marshal marshals "v" into byte sequence. - Marshal(v interface{}) ([]byte, error) + Marshal(v any) ([]byte, error) // Unmarshal unmarshals "data" into "v". // "v" must be a pointer value. - Unmarshal(data []byte, v interface{}) error + Unmarshal(data []byte, v any) error // NewDecoder returns a Decoder which reads byte sequence from "r". NewDecoder(r io.Reader) Decoder // NewEncoder returns an Encoder which writes bytes sequence into "w". @@ -18,30 +18,30 @@ type Marshaler interface { // ContentType returns the Content-Type which this marshaler is responsible for. // The parameter describes the type which is being marshalled, which can sometimes // affect the content type returned. - ContentType(v interface{}) string + ContentType(v any) string } // Decoder decodes a byte sequence type Decoder interface { - Decode(v interface{}) error + Decode(v any) error } // Encoder encodes gRPC payloads / fields into byte sequence. type Encoder interface { - Encode(v interface{}) error + Encode(v any) error } // DecoderFunc adapts an decoder function into Decoder. -type DecoderFunc func(v interface{}) error +type DecoderFunc func(v any) error // Decode delegates invocations to the underlying function itself. -func (f DecoderFunc) Decode(v interface{}) error { return f(v) } +func (f DecoderFunc) Decode(v any) error { return f(v) } // EncoderFunc adapts an encoder function into Encoder -type EncoderFunc func(v interface{}) error +type EncoderFunc func(v any) error // Encode delegates invocations to the underlying function itself. -func (f EncoderFunc) Encode(v interface{}) error { return f(v) } +func (f EncoderFunc) Encode(v any) error { return f(v) } // Delimited defines the streaming delimiter. type Delimited interface { diff --git a/runtime/marshaler_registry_test.go b/runtime/marshaler_registry_test.go index dccfe95..d92ff11 100644 --- a/runtime/marshaler_registry_test.go +++ b/runtime/marshaler_registry_test.go @@ -93,12 +93,12 @@ func TestMarshalerForRequest(t *testing.T) { type dummyMarshaler int -func (dummyMarshaler) ContentType(_ interface{}) string { return "" } -func (dummyMarshaler) Marshal(interface{}) ([]byte, error) { +func (dummyMarshaler) ContentType(_ any) string { return "" } +func (dummyMarshaler) Marshal(any) ([]byte, error) { return nil, errors.New("not implemented") } -func (dummyMarshaler) Unmarshal([]byte, interface{}) error { +func (dummyMarshaler) Unmarshal([]byte, any) error { return errors.New("not implemented") } @@ -115,12 +115,12 @@ func (m dummyMarshaler) GoString() string { type dummyDecoder struct{} -func (dummyDecoder) Decode(interface{}) error { +func (dummyDecoder) Decode(any) error { return errors.New("not implemented") } type dummyEncoder struct{} -func (dummyEncoder) Encode(interface{}) error { +func (dummyEncoder) Encode(any) error { return errors.New("not implemented") }