diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index 7ae30a38dade..f2bfb2c1cd2b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -462,6 +462,10 @@ public void processOpts() { writePropertyBack(JAVA_17, true); } + if (libRestTemplate && useJakartaEe) { + writePropertyBack(JAVA_17, true); + } + if (libMicroprofile && useSealedOneOfInterfaces) { writePropertyBack(JAVA_17, true); } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache index f5c8c1a4fd9a..379145c730f2 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache @@ -78,7 +78,6 @@ public class {{classname}} { {{/externalDocs}} */ private ResponseSpec {{operationId}}RequestCreation({{#allParams}}{{>nullableArgumentForApi}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws RestClientResponseException { - Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}; {{#allParams}} {{#required}} // verify the required parameter '{{paramName}}' is set @@ -128,9 +127,13 @@ public class {{classname}} { {{#hasHeaderParams}} {{#headerParams}} - if ({{paramName}} != null) - headerParams.add("{{baseName}}", apiClient.parameterToString({{paramName}}));{{^-last}} - {{/-last}} + {{^required}} + if ({{paramName}} != null) { + {{/required}} + {{^required}} {{/required}}headerParams.add("{{baseName}}", apiClient.parameterToString({{paramName}})); + {{^required}} + } + {{/required}} {{/headerParams}} {{/hasHeaderParams}} {{#hasCookieParams}} @@ -142,8 +145,13 @@ public class {{classname}} { {{#hasFormParams}} {{#formParams}} - if ({{paramName}} != null) - formParams.add{{#collectionFormat}}All{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}{{#useAbstractionForFiles}}{{paramName}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}new FileSystemResource({{paramName}}){{/useAbstractionForFiles}}{{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream(){{^useAbstractionForFiles}}.map(FileSystemResource::new){{/useAbstractionForFiles}}.collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}); + {{^required}} + if ({{paramName}} != null) { + {{/required}} + {{^required}} {{/required}}formParams.add{{#collectionFormat}}All{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}{{#useAbstractionForFiles}}{{paramName}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}new FileSystemResource({{paramName}}){{/useAbstractionForFiles}}{{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream(){{^useAbstractionForFiles}}.map(FileSystemResource::new){{/useAbstractionForFiles}}.collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}); + {{^required}} + } + {{/required}} {{/formParams}} {{/hasFormParams}} @@ -159,7 +167,7 @@ public class {{classname}} { String[] localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{^-last}}, {{/-last}}{{/authMethods}} }; {{#returnType}}ParameterizedTypeReference<{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}> localVarReturnType = new ParameterizedTypeReference<>() {};{{/returnType}}{{^returnType}}ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {};{{/returnType}} - return apiClient.invokeAPI("{{{path}}}", HttpMethod.{{httpMethod}}, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("{{{path}}}", HttpMethod.{{httpMethod}}, pathParams, localVarQueryParams, {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache index c614f0a23851..3b0f1ec27607 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache @@ -110,7 +110,6 @@ public class {{classname}} extends BaseApi { @Deprecated {{/isDeprecated}} public ResponseEntity<{{#returnType}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{.}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{.}}}{{/isResponseFile}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{>nullableArgumentForApi}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws RestClientException { - Object localVarPostBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}; {{#allParams}}{{#required}} // verify the required parameter '{{paramName}}' is set if ({{paramName}} == null) { @@ -118,32 +117,56 @@ public class {{classname}} extends BaseApi { } {{/required}}{{/allParams}}{{#hasPathParams}} // create path and map variables - final Map uriVariables = new HashMap();{{#pathParams}} + final Map uriVariables = new HashMap<>();{{#pathParams}} uriVariables.put("{{baseName}}", {{#collectionFormat}}apiClient.collectionPathParameterToString(ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase()), {{{paramName}}}){{/collectionFormat}}{{^collectionFormat}}{{{paramName}}}{{/collectionFormat}});{{/pathParams}}{{/hasPathParams}} - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap();{{#hasQueryParams}} + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>();{{#hasQueryParams}} {{#queryParams}}{{#isExplode}}{{#hasVars}} if ({{paramName}} != null) { {{#vars}} localVarQueryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}}.{{getter}}())); {{/vars}}}{{/hasVars}}{{^hasVars}}localVarQueryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}})); {{/hasVars}}{{/isExplode}}{{^isExplode}}localVarQueryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}})); - {{/isExplode}}{{/queryParams}}{{/hasQueryParams}}{{#hasHeaderParams}} + {{/isExplode}}{{/queryParams}}{{/hasQueryParams}} + {{#hasHeaderParams}} - {{#headerParams}}if ({{paramName}} != null) - localVarHeaderParams.add("{{baseName}}", apiClient.parameterToString({{paramName}}));{{^-last}} - {{/-last}}{{/headerParams}}{{/hasHeaderParams}}{{#hasCookieParams}} + {{#headerParams}} + {{^required}} + if ({{paramName}} != null) { + {{/required}} + {{^required}} {{/required}}localVarHeaderParams.add("{{baseName}}", apiClient.parameterToString({{paramName}})); + {{^required}} + } + {{/required}} + {{/headerParams}} + {{/hasHeaderParams}} + {{#hasCookieParams}} - {{#cookieParams}}if ({{paramName}} != null) - localVarCookieParams.add("{{baseName}}", apiClient.parameterToString({{paramName}}));{{^-last}} - {{/-last}}{{/cookieParams}}{{/hasCookieParams}}{{#hasFormParams}} + {{#cookieParams}} + {{^required}} + if ({{paramName}} != null) { + {{/required}} + {{^required}} {{/required}}localVarCookieParams.add("{{baseName}}", apiClient.parameterToString({{paramName}})); + {{^required}} + } + {{/required}} + {{/cookieParams}} + {{/hasCookieParams}} + {{#hasFormParams}} - {{#formParams}}if ({{paramName}} != null) - localVarFormParams.{{^collectionFormat}}add{{/collectionFormat}}{{#collectionFormat}}addAll{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}{{#useAbstractionForFiles}}{{paramName}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}new FileSystemResource({{paramName}}){{/useAbstractionForFiles}}{{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream(){{^useAbstractionForFiles}}.map(FileSystemResource::new){{/useAbstractionForFiles}}.collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{^-last}} - {{/-last}}{{/formParams}}{{/hasFormParams}} + {{#formParams}} + {{^required}} + if ({{paramName}} != null) { + {{/required}} + {{^required}} {{/required}}localVarFormParams.{{^collectionFormat}}add{{/collectionFormat}}{{#collectionFormat}}addAll{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}{{#useAbstractionForFiles}}{{paramName}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}new FileSystemResource({{paramName}}){{/useAbstractionForFiles}}{{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream(){{^useAbstractionForFiles}}.map(FileSystemResource::new){{/useAbstractionForFiles}}.collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}); + {{^required}} + } + {{/required}} + {{/formParams}} + {{/hasFormParams}} final String[] localVarAccepts = { {{#hasProduces}} {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} @@ -156,21 +179,20 @@ public class {{classname}} extends BaseApi { String[] localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{^-last}}, {{/-last}}{{/authMethods}} }; - {{#returnType}}ParameterizedTypeReference<{{#returnType}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{.}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{.}}}{{/isResponseFile}}{{/returnType}}> localReturnType = new ParameterizedTypeReference<{{#returnType}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{.}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{.}}}{{/isResponseFile}}{{/returnType}}>() {};{{/returnType}}{{^returnType}}ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {};{{/returnType}} - return apiClient.invokeAPI("{{{path}}}", HttpMethod.{{httpMethod}}, {{#hasPathParams}}uriVariables{{/hasPathParams}}{{^hasPathParams}}Collections.emptyMap(){{/hasPathParams}}, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + {{#returnType}}ParameterizedTypeReference<{{#returnType}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{.}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{.}}}{{/isResponseFile}}{{/returnType}}> localReturnType = new ParameterizedTypeReference<{{^java17}}{{#returnType}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{.}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{.}}}{{/isResponseFile}}{{/returnType}}{{/java17}}>() {};{{/returnType}}{{^returnType}}ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<{{^java17}}Void{{/java17}}>() {};{{/returnType}} + return apiClient.invokeAPI("{{{path}}}", HttpMethod.{{httpMethod}}, {{#hasPathParams}}uriVariables{{/hasPathParams}}{{^hasPathParams}}Collections.emptyMap(){{/hasPathParams}}, localVarQueryParams, {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } {{#-last}} @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { {{#hasProduces}} {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} @@ -183,7 +205,7 @@ public class {{classname}} extends BaseApi { String[] localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{^-last}}, {{/-last}}{{/authMethods}} }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } {{/-last}} {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache index 833ecd9377be..0e713abe59ae 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache @@ -70,14 +70,14 @@ if(hasProperty('target') && target == 'android') { targetSdkVersion 22 } compileOptions { - {{#useJakartaEe}} + {{#java17}} sourceCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17 - {{/useJakartaEe}} - {{^useJakartaEe}} + {{/java17}} + {{^java17}} sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 - {{/useJakartaEe}} + {{/java17}} } // Rename the aar correctly @@ -123,14 +123,14 @@ if(hasProperty('target') && target == 'android') { apply plugin: 'maven-publish' java { - {{#useJakartaEe}} + {{#java17}} sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 - {{/useJakartaEe}} - {{^useJakartaEe}} + {{/java17}} + {{^java17}} sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 - {{/useJakartaEe}} + {{/java17}} } publishing { diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache index 0d1ab6e85f50..6128ca56a2e5 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache @@ -152,18 +152,14 @@ maven-compiler-plugin 3.11.0 - {{#useJakartaEe}} + {{#java17}} 17 17 - {{/useJakartaEe}} - {{#useSpringBoot4}} - 17 - 17 - {{/useSpringBoot4}} - {{^useJakartaEe}}{{^useSpringBoot4}} + {{/java17}} + {{^java17}} 1.8 1.8 - {{/useSpringBoot4}}{{/useJakartaEe}} + {{/java17}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache index 6f86f1697dab..bff3fe786b15 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache @@ -86,7 +86,6 @@ public class {{classname}} { @Deprecated {{/isDeprecated}} private ResponseSpec {{operationId}}RequestCreation({{#allParams}}{{>nullableArgumentForApi}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws WebClientResponseException { - Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}; {{#allParams}} {{#required}} // verify the required parameter '{{paramName}}' is set @@ -96,7 +95,7 @@ public class {{classname}} { {{/required}} {{/allParams}} // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); {{#hasPathParams}} {{#pathParams}} @@ -104,10 +103,10 @@ public class {{classname}} { {{/pathParams}} {{/hasPathParams}} - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); {{#hasQueryParams}} {{#queryParams}} @@ -134,9 +133,13 @@ public class {{classname}} { {{#hasHeaderParams}} {{#headerParams}} - if ({{paramName}} != null) - headerParams.add("{{baseName}}", apiClient.parameterToString({{paramName}}));{{^-last}} - {{/-last}} + {{^required}} + if ({{paramName}} != null) { + {{/required}} + {{^required}} {{/required}}headerParams.add("{{baseName}}", apiClient.parameterToString({{paramName}})); + {{^required}} + } + {{/required}} {{/headerParams}} {{/hasHeaderParams}} {{#hasCookieParams}} @@ -148,8 +151,13 @@ public class {{classname}} { {{#hasFormParams}} {{#formParams}} - if ({{paramName}} != null) - formParams.add{{#collectionFormat}}All{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}{{#useAbstractionForFiles}}{{paramName}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}new FileSystemResource({{paramName}}){{/useAbstractionForFiles}}{{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream(){{^useAbstractionForFiles}}.map(FileSystemResource::new){{/useAbstractionForFiles}}.collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}); + {{^required}} + if ({{paramName}} != null) { + {{/required}} + {{^required}} {{/required}}formParams.add{{#collectionFormat}}All{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}{{#useAbstractionForFiles}}{{paramName}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}new FileSystemResource({{paramName}}){{/useAbstractionForFiles}}{{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream(){{^useAbstractionForFiles}}.map(FileSystemResource::new){{/useAbstractionForFiles}}.collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}); + {{^required}} + } + {{/required}} {{/formParams}} {{/hasFormParams}} @@ -164,8 +172,8 @@ public class {{classname}} { String[] localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{^-last}}, {{/-last}}{{/authMethods}} }; - {{#returnType}}ParameterizedTypeReference<{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnBaseType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnBaseType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}> localVarReturnType = new ParameterizedTypeReference<{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnBaseType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnBaseType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}>() {};{{/returnType}}{{^returnType}}ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {};{{/returnType}} - return apiClient.invokeAPI("{{{path}}}", HttpMethod.{{httpMethod}}, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + {{#returnType}}ParameterizedTypeReference<{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnBaseType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnBaseType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}> localVarReturnType = new ParameterizedTypeReference<{{^java17}}{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnBaseType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnBaseType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{/java17}}>() {};{{/returnType}}{{^returnType}}ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<{{^java17}}Void{{/java17}}>() {};{{/returnType}} + return apiClient.invokeAPI("{{{path}}}", HttpMethod.{{httpMethod}}, pathParams, localVarQueryParams, {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -187,7 +195,7 @@ public class {{classname}} { @Deprecated {{/isDeprecated}} public {{#returnType}}{{#vendorExtensions.x-webclient-blocking}}{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#uniqueItems}}Set{{/uniqueItems}}{{^uniqueItems}}List{{/uniqueItems}}<{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnBaseType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnBaseType}}}{{/isResponseFile}}>{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{/vendorExtensions.x-webclient-blocking}}{{^vendorExtensions.x-webclient-blocking}}{{#vendorExtensions.x-webclient-return-except-list-of-string}}Flux<{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnBaseType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnBaseType}}}{{/isResponseFile}}>{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}Mono<{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}>{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{/vendorExtensions.x-webclient-blocking}} {{/returnType}}{{^returnType}}{{#vendorExtensions.x-webclient-blocking}}void{{/vendorExtensions.x-webclient-blocking}}{{^vendorExtensions.x-webclient-blocking}}Mono{{/vendorExtensions.x-webclient-blocking}} {{/returnType}}{{operationId}}({{#allParams}}{{>nullableArgumentForApi}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws WebClientResponseException { - {{#returnType}}ParameterizedTypeReference<{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnBaseType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnBaseType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}> localVarReturnType = new ParameterizedTypeReference<{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnBaseType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnBaseType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}>() {};{{/returnType}}{{^returnType}}ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {};{{/returnType}} + {{#returnType}}ParameterizedTypeReference<{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnBaseType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnBaseType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}> localVarReturnType = new ParameterizedTypeReference<{{^java17}}{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnBaseType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnBaseType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{/java17}}>() {};{{/returnType}}{{^returnType}}ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<{{^java17}}Void{{/java17}}>() {};{{/returnType}} {{^returnType}}{{^vendorExtensions.x-webclient-blocking}}return {{/vendorExtensions.x-webclient-blocking}}{{/returnType}}{{#returnType}}return {{/returnType}}{{operationId}}RequestCreation({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).{{#vendorExtensions.x-webclient-return-except-list-of-string}}bodyToFlux{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}bodyToMono{{/vendorExtensions.x-webclient-return-except-list-of-string}}(localVarReturnType){{#vendorExtensions.x-webclient-blocking}}{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#uniqueItems}}.collect(Collectors.toSet()){{/uniqueItems}}{{^uniqueItems}}.collectList(){{/uniqueItems}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}.block(){{/vendorExtensions.x-webclient-blocking}}; } @@ -210,7 +218,7 @@ public class {{classname}} { @Deprecated {{/isDeprecated}} public {{#vendorExtensions.x-webclient-blocking}}{{#returnType}}{{#vendorExtensions.x-webclient-return-except-list-of-string}}ResponseEntity>{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}ResponseEntity<{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}>{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{/returnType}}{{^returnType}}ResponseEntity{{/returnType}} {{/vendorExtensions.x-webclient-blocking}}{{^vendorExtensions.x-webclient-blocking}}{{#returnType}}{{#vendorExtensions.x-webclient-return-except-list-of-string}}Mono>>{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}Mono>{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{/returnType}}{{^returnType}}Mono>{{/returnType}} {{/vendorExtensions.x-webclient-blocking}}{{operationId}}WithHttpInfo({{#allParams}}{{>nullableArgumentForApi}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws WebClientResponseException { - {{#returnType}}ParameterizedTypeReference<{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnBaseType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnBaseType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}> localVarReturnType = new ParameterizedTypeReference<{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnBaseType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnBaseType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}>() {};{{/returnType}}{{^returnType}}ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {};{{/returnType}} + {{#returnType}}ParameterizedTypeReference<{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnBaseType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnBaseType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}> localVarReturnType = new ParameterizedTypeReference<{{^java17}}{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnBaseType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnBaseType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{returnType}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{/java17}}>() {};{{/returnType}}{{^returnType}}ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<{{^java17}}Void{{/java17}}>() {};{{/returnType}} return {{operationId}}RequestCreation({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).{{#vendorExtensions.x-webclient-return-except-list-of-string}}toEntityList{{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}toEntity{{/vendorExtensions.x-webclient-return-except-list-of-string}}(localVarReturnType){{#vendorExtensions.x-webclient-blocking}}.block(){{/vendorExtensions.x-webclient-blocking}}; } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 1a4d98d498eb..bf385fe141a3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -4947,6 +4947,50 @@ public void testWebClientDeprecatedOperation() { .assertMethod("findPetsByStatusWithResponseSpec").doesNotHaveAnnotation("Deprecated"); } + @DataProvider + public static Object[] springBasedClients() { + return new Object[]{RESTTEMPLATE, RESTCLIENT, WEBCLIENT}; + } + + @Test(dataProvider = "springBasedClients") + public void shouldNotNullCheckRequiredParametersTwice(String library) { + final Map files = generateFromContract( + "src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml", library); + final Path fakeApi = files.get("FakeApi.java").toPath(); + + // required parameters are already validated to be non-null, so they are added unconditionally + assertFileContains(fakeApi, + "Params.add(\"required_boolean_group\", apiClient.parameterToString(requiredBooleanGroup));", + "Params.add(\"number\", number);"); + assertFileNotContains(fakeApi, "if (requiredBooleanGroup != null)", "if (number != null)"); + // optional parameters are null-checked, with braces + assertFileContains(fakeApi, + "if (booleanGroup != null) {", + "if (integer != null) {"); + // the request body is passed to invokeAPI directly + assertFileNotContains(fakeApi, "postBody", "PostBody"); + } + + @Test(dataProvider = "springBasedClients") + public void shouldUseDiamondOperatorWhereSupported(String library) { + for (boolean useJakartaEe : new boolean[]{false, true}) { + final Map files = generateFromContract("src/test/resources/3_0/petstore.yaml", library, + Map.of(JavaClientCodegen.USE_JAKARTA_EE, useJakartaEe)); + final Path petApi = files.get("PetApi.java").toPath(); + + assertFileContains(petApi, "new LinkedMultiValueMap<>()"); + assertFileNotContains(petApi, "new LinkedMultiValueMap() {}"); + } else { + assertFileContains(petApi, "new ParameterizedTypeReference() {}"); + assertFileNotContains(petApi, "new ParameterizedTypeReference<>() {}"); + } + } + } + @Test public void testOneOfClassWithAnnotation() { final Map files = generateFromContract("src/test/resources/3_0/java/oneOf-with-annotations.yaml", RESTCLIENT); diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/AuthApi.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/AuthApi.java index ebdf5c2878ba..283aaace24f9 100644 --- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/AuthApi.java +++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/AuthApi.java @@ -51,7 +51,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testAuthHttpBasicRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -70,7 +69,7 @@ private ResponseSpec testAuthHttpBasicRequestCreation() throws RestClientRespons String[] localVarAuthNames = new String[] { "http_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/auth/http/basic", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/auth/http/basic", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -116,7 +115,6 @@ public ResponseSpec testAuthHttpBasicWithResponseSpec() throws RestClientRespons * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testAuthHttpBearerRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -135,7 +133,7 @@ private ResponseSpec testAuthHttpBearerRequestCreation() throws RestClientRespon String[] localVarAuthNames = new String[] { "http_bearer_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/auth/http/bearer", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/auth/http/bearer", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/BodyApi.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/BodyApi.java index af131e9e25a6..a7965480a15e 100644 --- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/BodyApi.java +++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/BodyApi.java @@ -55,7 +55,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBinaryGifRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -74,7 +73,7 @@ private ResponseSpec testBinaryGifRequestCreation() throws RestClientResponseExc String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/binary/gif", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/binary/gif", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -121,7 +120,6 @@ public ResponseSpec testBinaryGifWithResponseSpec() throws RestClientResponseExc * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyApplicationOctetstreamBinaryRequestCreation(@jakarta.annotation.Nullable File body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -142,7 +140,7 @@ private ResponseSpec testBodyApplicationOctetstreamBinaryRequestCreation(@jakart String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/body/application/octetstream/binary", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/body/application/octetstream/binary", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -192,7 +190,6 @@ public ResponseSpec testBodyApplicationOctetstreamBinaryWithResponseSpec(@jakart * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyMultipartFormdataArrayOfBinaryRequestCreation(@jakarta.annotation.Nonnull List files) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'files' is set if (files == null) { throw new RestClientResponseException("Missing the required parameter 'files' when calling testBodyMultipartFormdataArrayOfBinary", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -205,8 +202,7 @@ private ResponseSpec testBodyMultipartFormdataArrayOfBinaryRequestCreation(@jaka final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (files != null) - formParams.addAll("files", files.stream().map(FileSystemResource::new).collect(Collectors.toList())); + formParams.addAll("files", files.stream().map(FileSystemResource::new).collect(Collectors.toList())); final String[] localVarAccepts = { "text/plain" @@ -220,7 +216,7 @@ private ResponseSpec testBodyMultipartFormdataArrayOfBinaryRequestCreation(@jaka String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/body/application/octetstream/array_of_binary", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/body/application/octetstream/array_of_binary", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -270,7 +266,6 @@ public ResponseSpec testBodyMultipartFormdataArrayOfBinaryWithResponseSpec(@jaka * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyMultipartFormdataSingleBinaryRequestCreation(@jakarta.annotation.Nullable File myFile) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -279,8 +274,9 @@ private ResponseSpec testBodyMultipartFormdataSingleBinaryRequestCreation(@jakar final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (myFile != null) + if (myFile != null) { formParams.add("my-file", new FileSystemResource(myFile)); + } final String[] localVarAccepts = { "text/plain" @@ -294,7 +290,7 @@ private ResponseSpec testBodyMultipartFormdataSingleBinaryRequestCreation(@jakar String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/body/application/octetstream/single_binary", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/body/application/octetstream/single_binary", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -344,7 +340,6 @@ public ResponseSpec testBodyMultipartFormdataSingleBinaryWithResponseSpec(@jakar * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEchoBodyAllOfPetRequestCreation(@jakarta.annotation.Nullable Pet pet) throws RestClientResponseException { - Object postBody = pet; // create path and map variables final Map pathParams = new HashMap<>(); @@ -365,7 +360,7 @@ private ResponseSpec testEchoBodyAllOfPetRequestCreation(@jakarta.annotation.Nul String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/echo/body/allOf/Pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/echo/body/allOf/Pet", HttpMethod.POST, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -415,7 +410,6 @@ public ResponseSpec testEchoBodyAllOfPetWithResponseSpec(@jakarta.annotation.Nul * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEchoBodyFreeFormObjectResponseStringRequestCreation(@jakarta.annotation.Nullable Object body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -436,7 +430,7 @@ private ResponseSpec testEchoBodyFreeFormObjectResponseStringRequestCreation(@ja String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/echo/body/FreeFormObject/response_string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/echo/body/FreeFormObject/response_string", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -486,7 +480,6 @@ public ResponseSpec testEchoBodyFreeFormObjectResponseStringWithResponseSpec(@ja * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEchoBodyPetRequestCreation(@jakarta.annotation.Nullable Pet pet) throws RestClientResponseException { - Object postBody = pet; // create path and map variables final Map pathParams = new HashMap<>(); @@ -507,7 +500,7 @@ private ResponseSpec testEchoBodyPetRequestCreation(@jakarta.annotation.Nullable String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/echo/body/Pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/echo/body/Pet", HttpMethod.POST, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -557,7 +550,6 @@ public ResponseSpec testEchoBodyPetWithResponseSpec(@jakarta.annotation.Nullable * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEchoBodyPetResponseStringRequestCreation(@jakarta.annotation.Nullable Pet pet) throws RestClientResponseException { - Object postBody = pet; // create path and map variables final Map pathParams = new HashMap<>(); @@ -578,7 +570,7 @@ private ResponseSpec testEchoBodyPetResponseStringRequestCreation(@jakarta.annot String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/echo/body/Pet/response_string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/echo/body/Pet/response_string", HttpMethod.POST, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -628,7 +620,6 @@ public ResponseSpec testEchoBodyPetResponseStringWithResponseSpec(@jakarta.annot * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEchoBodyStringEnumRequestCreation(@jakarta.annotation.Nullable String body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -649,7 +640,7 @@ private ResponseSpec testEchoBodyStringEnumRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/echo/body/string_enum", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/echo/body/string_enum", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -699,7 +690,6 @@ public ResponseSpec testEchoBodyStringEnumWithResponseSpec(@jakarta.annotation.N * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEchoBodyTagResponseStringRequestCreation(@jakarta.annotation.Nullable Tag tag) throws RestClientResponseException { - Object postBody = tag; // create path and map variables final Map pathParams = new HashMap<>(); @@ -720,7 +710,7 @@ private ResponseSpec testEchoBodyTagResponseStringRequestCreation(@jakarta.annot String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/echo/body/Tag/response_string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/echo/body/Tag/response_string", HttpMethod.POST, pathParams, localVarQueryParams, tag, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/FormApi.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/FormApi.java index 2f3995b0970b..c9819ac4d58f 100644 --- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/FormApi.java +++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/FormApi.java @@ -55,7 +55,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testFormIntegerBooleanStringRequestCreation(@jakarta.annotation.Nullable Integer integerForm, @jakarta.annotation.Nullable Boolean booleanForm, @jakarta.annotation.Nullable String stringForm) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -64,12 +63,15 @@ private ResponseSpec testFormIntegerBooleanStringRequestCreation(@jakarta.annota final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (integerForm != null) + if (integerForm != null) { formParams.add("integer_form", integerForm); - if (booleanForm != null) + } + if (booleanForm != null) { formParams.add("boolean_form", booleanForm); - if (stringForm != null) + } + if (stringForm != null) { formParams.add("string_form", stringForm); + } final String[] localVarAccepts = { "text/plain" @@ -83,7 +85,7 @@ private ResponseSpec testFormIntegerBooleanStringRequestCreation(@jakarta.annota String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/form/integer/boolean/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/form/integer/boolean/string", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -139,7 +141,6 @@ public ResponseSpec testFormIntegerBooleanStringWithResponseSpec(@jakarta.annota * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testFormObjectMultipartRequestCreation(@jakarta.annotation.Nonnull TestFormObjectMultipartRequestMarker marker) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'marker' is set if (marker == null) { throw new RestClientResponseException("Missing the required parameter 'marker' when calling testFormObjectMultipart", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -152,8 +153,7 @@ private ResponseSpec testFormObjectMultipartRequestCreation(@jakarta.annotation. final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (marker != null) - formParams.add("marker", marker); + formParams.add("marker", marker); final String[] localVarAccepts = { "text/plain" @@ -167,7 +167,7 @@ private ResponseSpec testFormObjectMultipartRequestCreation(@jakarta.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/form/object/multipart", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/form/object/multipart", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -222,7 +222,6 @@ public ResponseSpec testFormObjectMultipartWithResponseSpec(@jakarta.annotation. * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testFormOneofRequestCreation(@jakarta.annotation.Nullable String form1, @jakarta.annotation.Nullable Integer form2, @jakarta.annotation.Nullable String form3, @jakarta.annotation.Nullable Boolean form4, @jakarta.annotation.Nullable Long id, @jakarta.annotation.Nullable String name) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -231,18 +230,24 @@ private ResponseSpec testFormOneofRequestCreation(@jakarta.annotation.Nullable S final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (form1 != null) + if (form1 != null) { formParams.add("form1", form1); - if (form2 != null) + } + if (form2 != null) { formParams.add("form2", form2); - if (form3 != null) + } + if (form3 != null) { formParams.add("form3", form3); - if (form4 != null) + } + if (form4 != null) { formParams.add("form4", form4); - if (id != null) + } + if (id != null) { formParams.add("id", id); - if (name != null) + } + if (name != null) { formParams.add("name", name); + } final String[] localVarAccepts = { "text/plain" @@ -256,7 +261,7 @@ private ResponseSpec testFormOneofRequestCreation(@jakarta.annotation.Nullable S String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/form/oneof", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/form/oneof", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/HeaderApi.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/HeaderApi.java index e670d4a5fe51..73d4fa1e4123 100644 --- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/HeaderApi.java +++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/HeaderApi.java @@ -57,7 +57,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testHeaderIntegerBooleanStringEnumsRequestCreation(@jakarta.annotation.Nullable Integer integerHeader, @jakarta.annotation.Nullable Boolean booleanHeader, @jakarta.annotation.Nullable String stringHeader, @jakarta.annotation.Nullable String enumNonrefStringHeader, @jakarta.annotation.Nullable StringEnumRef enumRefStringHeader) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -66,16 +65,22 @@ private ResponseSpec testHeaderIntegerBooleanStringEnumsRequestCreation(@jakarta final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (integerHeader != null) - headerParams.add("integer_header", apiClient.parameterToString(integerHeader)); - if (booleanHeader != null) - headerParams.add("boolean_header", apiClient.parameterToString(booleanHeader)); - if (stringHeader != null) - headerParams.add("string_header", apiClient.parameterToString(stringHeader)); - if (enumNonrefStringHeader != null) - headerParams.add("enum_nonref_string_header", apiClient.parameterToString(enumNonrefStringHeader)); - if (enumRefStringHeader != null) - headerParams.add("enum_ref_string_header", apiClient.parameterToString(enumRefStringHeader)); + if (integerHeader != null) { + headerParams.add("integer_header", apiClient.parameterToString(integerHeader)); + } + if (booleanHeader != null) { + headerParams.add("boolean_header", apiClient.parameterToString(booleanHeader)); + } + if (stringHeader != null) { + headerParams.add("string_header", apiClient.parameterToString(stringHeader)); + } + if (enumNonrefStringHeader != null) { + headerParams.add("enum_nonref_string_header", apiClient.parameterToString(enumNonrefStringHeader)); + } + if (enumRefStringHeader != null) { + headerParams.add("enum_ref_string_header", apiClient.parameterToString(enumRefStringHeader)); + } + final String[] localVarAccepts = { "text/plain" }; @@ -86,7 +91,7 @@ private ResponseSpec testHeaderIntegerBooleanStringEnumsRequestCreation(@jakarta String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/header/integer/boolean/string/enums", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/header/integer/boolean/string/enums", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/PathApi.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/PathApi.java index abb834b23c7d..18b42245b6a8 100644 --- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/PathApi.java +++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/PathApi.java @@ -56,7 +56,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathRequestCreation(@jakarta.annotation.Nonnull String pathString, @jakarta.annotation.Nonnull Integer pathInteger, @jakarta.annotation.Nonnull String enumNonrefStringPath, @jakarta.annotation.Nonnull StringEnumRef enumRefStringPath) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'pathString' is set if (pathString == null) { throw new RestClientResponseException("Missing the required parameter 'pathString' when calling testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPath", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -96,7 +95,7 @@ private ResponseSpec testsPathStringPathStringIntegerPathIntegerEnumNonrefString String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/path/string/{path_string}/integer/{path_integer}/{enum_nonref_string_path}/{enum_ref_string_path}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/path/string/{path_string}/integer/{path_integer}/{enum_nonref_string_path}/{enum_ref_string_path}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/QueryApi.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/QueryApi.java index 092deb630044..ff53472e5eb4 100644 --- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/QueryApi.java +++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/api/QueryApi.java @@ -60,7 +60,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEnumRefStringRequestCreation(@jakarta.annotation.Nullable String enumNonrefStringQuery, @jakarta.annotation.Nullable StringEnumRef enumRefStringQuery) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -82,7 +81,7 @@ private ResponseSpec testEnumRefStringRequestCreation(@jakarta.annotation.Nullab String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/query/enum_ref_string", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/enum_ref_string", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -137,7 +136,6 @@ public ResponseSpec testEnumRefStringWithResponseSpec(@jakarta.annotation.Nullab * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryDatetimeDateStringRequestCreation(@jakarta.annotation.Nullable Instant datetimeQuery, @jakarta.annotation.Nullable LocalDate dateQuery, @jakarta.annotation.Nullable String stringQuery) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -160,7 +158,7 @@ private ResponseSpec testQueryDatetimeDateStringRequestCreation(@jakarta.annotat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/query/datetime/date/string", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/datetime/date/string", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -218,7 +216,6 @@ public ResponseSpec testQueryDatetimeDateStringWithResponseSpec(@jakarta.annotat * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryIntegerBooleanStringRequestCreation(@jakarta.annotation.Nullable Integer integerQuery, @jakarta.annotation.Nullable Boolean booleanQuery, @jakarta.annotation.Nullable String stringQuery) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -241,7 +238,7 @@ private ResponseSpec testQueryIntegerBooleanStringRequestCreation(@jakarta.annot String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/query/integer/boolean/string", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/integer/boolean/string", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -297,7 +294,6 @@ public ResponseSpec testQueryIntegerBooleanStringWithResponseSpec(@jakarta.annot * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryStyleDeepObjectExplodeTrueObjectRequestCreation(@jakarta.annotation.Nullable Pet queryObject) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -325,7 +321,7 @@ private ResponseSpec testQueryStyleDeepObjectExplodeTrueObjectRequestCreation(@j String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/query/style_deepObject/explode_true/object", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_deepObject/explode_true/object", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -375,7 +371,6 @@ public ResponseSpec testQueryStyleDeepObjectExplodeTrueObjectWithResponseSpec(@j * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryStyleDeepObjectExplodeTrueObjectAllOfRequestCreation(@jakarta.annotation.Nullable TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter queryObject) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -396,7 +391,7 @@ private ResponseSpec testQueryStyleDeepObjectExplodeTrueObjectAllOfRequestCreati String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/query/style_deepObject/explode_true/object/allOf", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_deepObject/explode_true/object/allOf", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -446,7 +441,6 @@ public ResponseSpec testQueryStyleDeepObjectExplodeTrueObjectAllOfWithResponseSp * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryStyleFormExplodeFalseArrayIntegerRequestCreation(@jakarta.annotation.Nullable List queryObject) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -467,7 +461,7 @@ private ResponseSpec testQueryStyleFormExplodeFalseArrayIntegerRequestCreation(@ String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/query/style_form/explode_false/array_integer", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_form/explode_false/array_integer", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -517,7 +511,6 @@ public ResponseSpec testQueryStyleFormExplodeFalseArrayIntegerWithResponseSpec(@ * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryStyleFormExplodeFalseArrayStringRequestCreation(@jakarta.annotation.Nullable List queryObject) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -538,7 +531,7 @@ private ResponseSpec testQueryStyleFormExplodeFalseArrayStringRequestCreation(@j String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/query/style_form/explode_false/array_string", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_form/explode_false/array_string", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -588,7 +581,6 @@ public ResponseSpec testQueryStyleFormExplodeFalseArrayStringWithResponseSpec(@j * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryStyleFormExplodeTrueArrayStringRequestCreation(@jakarta.annotation.Nullable TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter queryObject) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -611,7 +603,7 @@ private ResponseSpec testQueryStyleFormExplodeTrueArrayStringRequestCreation(@ja String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/query/style_form/explode_true/array_string", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_form/explode_true/array_string", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -661,7 +653,6 @@ public ResponseSpec testQueryStyleFormExplodeTrueArrayStringWithResponseSpec(@ja * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryStyleFormExplodeTrueObjectRequestCreation(@jakarta.annotation.Nullable Pet queryObject) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -689,7 +680,7 @@ private ResponseSpec testQueryStyleFormExplodeTrueObjectRequestCreation(@jakarta String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/query/style_form/explode_true/object", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_form/explode_true/object", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -739,7 +730,6 @@ public ResponseSpec testQueryStyleFormExplodeTrueObjectWithResponseSpec(@jakarta * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryStyleFormExplodeTrueObjectAllOfRequestCreation(@jakarta.annotation.Nullable DataQuery queryObject) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -760,7 +750,7 @@ private ResponseSpec testQueryStyleFormExplodeTrueObjectAllOfRequestCreation(@ja String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/query/style_form/explode_true/object/allOf", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_form/explode_true/object/allOf", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -811,7 +801,6 @@ public ResponseSpec testQueryStyleFormExplodeTrueObjectAllOfWithResponseSpec(@ja * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryStyleJsonSerializationObjectRequestCreation(@jakarta.annotation.Nullable Pet jsonSerializedObjectRefStringQuery, @jakarta.annotation.Nullable List jsonSerializedObjectArrayRefStringQuery) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -833,7 +822,7 @@ private ResponseSpec testQueryStyleJsonSerializationObjectRequestCreation(@jakar String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/query/style_jsonSerialization/object", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_jsonSerialization/object", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/echo_api/java/resttemplate/pom.xml b/samples/client/echo_api/java/resttemplate/pom.xml index 59847669944c..63c8935d52bb 100644 --- a/samples/client/echo_api/java/resttemplate/pom.xml +++ b/samples/client/echo_api/java/resttemplate/pom.xml @@ -145,10 +145,8 @@ maven-compiler-plugin 3.11.0 - 1.8 1.8 - diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/AuthApi.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/AuthApi.java index bf330492da0f..3e617c72cf17 100644 --- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/AuthApi.java +++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/AuthApi.java @@ -53,13 +53,12 @@ public String testAuthHttpBasic() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testAuthHttpBasicWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "text/plain" @@ -71,7 +70,7 @@ public ResponseEntity testAuthHttpBasicWithHttpInfo() throws RestClientE String[] localVarAuthNames = new String[] { "http_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/auth/http/basic", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/auth/http/basic", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * To test HTTP bearer authentication @@ -92,13 +91,12 @@ public String testAuthHttpBearer() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testAuthHttpBearerWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "text/plain" @@ -110,19 +108,18 @@ public ResponseEntity testAuthHttpBearerWithHttpInfo() throws RestClient String[] localVarAuthNames = new String[] { "http_bearer_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/auth/http/bearer", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/auth/http/bearer", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "text/plain" @@ -133,6 +130,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { "http_bearer_auth" }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/BodyApi.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/BodyApi.java index bf9b937415f8..836448a63a16 100644 --- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/BodyApi.java +++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/BodyApi.java @@ -57,13 +57,12 @@ public File testBinaryGif() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testBinaryGifWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "image/gif" @@ -75,7 +74,7 @@ public ResponseEntity testBinaryGifWithHttpInfo() throws RestClientExcepti String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/binary/gif", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/binary/gif", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test body parameter(s) @@ -98,13 +97,12 @@ public String testBodyApplicationOctetstreamBinary(@javax.annotation.Nullable Fi * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testBodyApplicationOctetstreamBinaryWithHttpInfo(@javax.annotation.Nullable File body) throws RestClientException { - Object localVarPostBody = body; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "text/plain" @@ -118,7 +116,7 @@ public ResponseEntity testBodyApplicationOctetstreamBinaryWithHttpInfo(@ String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/body/application/octetstream/binary", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/body/application/octetstream/binary", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, body, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test array of binary in multipart mime @@ -141,7 +139,6 @@ public String testBodyMultipartFormdataArrayOfBinary(@javax.annotation.Nonnull L * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testBodyMultipartFormdataArrayOfBinaryWithHttpInfo(@javax.annotation.Nonnull List files) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'files' is set if (files == null) { @@ -149,13 +146,12 @@ public ResponseEntity testBodyMultipartFormdataArrayOfBinaryWithHttpInfo } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (files != null) - localVarFormParams.addAll("files", files.stream().map(FileSystemResource::new).collect(Collectors.toList())); + localVarFormParams.addAll("files", files.stream().map(FileSystemResource::new).collect(Collectors.toList())); final String[] localVarAccepts = { "text/plain" @@ -169,7 +165,7 @@ public ResponseEntity testBodyMultipartFormdataArrayOfBinaryWithHttpInfo String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/body/application/octetstream/array_of_binary", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/body/application/octetstream/array_of_binary", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test single binary in multipart mime @@ -192,16 +188,16 @@ public String testBodyMultipartFormdataSingleBinary(@javax.annotation.Nullable F * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testBodyMultipartFormdataSingleBinaryWithHttpInfo(@javax.annotation.Nullable File myFile) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (myFile != null) + if (myFile != null) { localVarFormParams.add("my-file", new FileSystemResource(myFile)); + } final String[] localVarAccepts = { "text/plain" @@ -215,7 +211,7 @@ public ResponseEntity testBodyMultipartFormdataSingleBinaryWithHttpInfo( String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/body/application/octetstream/single_binary", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/body/application/octetstream/single_binary", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test body parameter(s) @@ -238,13 +234,12 @@ public Pet testEchoBodyAllOfPet(@javax.annotation.Nullable Pet pet) throws RestC * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testEchoBodyAllOfPetWithHttpInfo(@javax.annotation.Nullable Pet pet) throws RestClientException { - Object localVarPostBody = pet; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -258,7 +253,7 @@ public ResponseEntity testEchoBodyAllOfPetWithHttpInfo(@javax.annotation.Nu String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/echo/body/allOf/Pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/echo/body/allOf/Pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test free form object @@ -281,13 +276,12 @@ public String testEchoBodyFreeFormObjectResponseString(@javax.annotation.Nullabl * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testEchoBodyFreeFormObjectResponseStringWithHttpInfo(@javax.annotation.Nullable Object body) throws RestClientException { - Object localVarPostBody = body; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "text/plain" @@ -301,7 +295,7 @@ public ResponseEntity testEchoBodyFreeFormObjectResponseStringWithHttpIn String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/echo/body/FreeFormObject/response_string", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/echo/body/FreeFormObject/response_string", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, body, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test body parameter(s) @@ -324,13 +318,12 @@ public Pet testEchoBodyPet(@javax.annotation.Nullable Pet pet) throws RestClient * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testEchoBodyPetWithHttpInfo(@javax.annotation.Nullable Pet pet) throws RestClientException { - Object localVarPostBody = pet; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -344,7 +337,7 @@ public ResponseEntity testEchoBodyPetWithHttpInfo(@javax.annotation.Nullabl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/echo/body/Pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/echo/body/Pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test empty response body @@ -367,13 +360,12 @@ public String testEchoBodyPetResponseString(@javax.annotation.Nullable Pet pet) * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testEchoBodyPetResponseStringWithHttpInfo(@javax.annotation.Nullable Pet pet) throws RestClientException { - Object localVarPostBody = pet; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "text/plain" @@ -387,7 +379,7 @@ public ResponseEntity testEchoBodyPetResponseStringWithHttpInfo(@javax.a String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/echo/body/Pet/response_string", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/echo/body/Pet/response_string", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test string enum response body @@ -410,13 +402,12 @@ public StringEnumRef testEchoBodyStringEnum(@javax.annotation.Nullable String bo * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testEchoBodyStringEnumWithHttpInfo(@javax.annotation.Nullable String body) throws RestClientException { - Object localVarPostBody = body; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -430,7 +421,7 @@ public ResponseEntity testEchoBodyStringEnumWithHttpInfo(@javax.a String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/echo/body/string_enum", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/echo/body/string_enum", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, body, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test empty json (request body) @@ -453,13 +444,12 @@ public String testEchoBodyTagResponseString(@javax.annotation.Nullable Tag tag) * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testEchoBodyTagResponseStringWithHttpInfo(@javax.annotation.Nullable Tag tag) throws RestClientException { - Object localVarPostBody = tag; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "text/plain" @@ -473,19 +463,18 @@ public ResponseEntity testEchoBodyTagResponseStringWithHttpInfo(@javax.a String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/echo/body/Tag/response_string", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/echo/body/Tag/response_string", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, tag, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "text/plain" @@ -498,6 +487,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/FormApi.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/FormApi.java index 243f1590792a..70c0f2c60fef 100644 --- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/FormApi.java +++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/FormApi.java @@ -60,20 +60,22 @@ public String testFormIntegerBooleanString(@javax.annotation.Nullable Integer in * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testFormIntegerBooleanStringWithHttpInfo(@javax.annotation.Nullable Integer integerForm, @javax.annotation.Nullable Boolean booleanForm, @javax.annotation.Nullable String stringForm) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (integerForm != null) + if (integerForm != null) { localVarFormParams.add("integer_form", integerForm); - if (booleanForm != null) + } + if (booleanForm != null) { localVarFormParams.add("boolean_form", booleanForm); - if (stringForm != null) + } + if (stringForm != null) { localVarFormParams.add("string_form", stringForm); + } final String[] localVarAccepts = { "text/plain" @@ -87,7 +89,7 @@ public ResponseEntity testFormIntegerBooleanStringWithHttpInfo(@javax.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/form/integer/boolean/string", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/form/integer/boolean/string", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test form parameter(s) for multipart schema @@ -110,7 +112,6 @@ public String testFormObjectMultipart(@javax.annotation.Nonnull TestFormObjectMu * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testFormObjectMultipartWithHttpInfo(@javax.annotation.Nonnull TestFormObjectMultipartRequestMarker marker) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'marker' is set if (marker == null) { @@ -118,13 +119,12 @@ public ResponseEntity testFormObjectMultipartWithHttpInfo(@javax.annotat } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (marker != null) - localVarFormParams.add("marker", marker); + localVarFormParams.add("marker", marker); final String[] localVarAccepts = { "text/plain" @@ -138,7 +138,7 @@ public ResponseEntity testFormObjectMultipartWithHttpInfo(@javax.annotat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/form/object/multipart", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/form/object/multipart", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test form parameter(s) for oneOf schema @@ -171,26 +171,31 @@ public String testFormOneof(@javax.annotation.Nullable String form1, @javax.anno * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testFormOneofWithHttpInfo(@javax.annotation.Nullable String form1, @javax.annotation.Nullable Integer form2, @javax.annotation.Nullable String form3, @javax.annotation.Nullable Boolean form4, @javax.annotation.Nullable Long id, @javax.annotation.Nullable String name) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (form1 != null) + if (form1 != null) { localVarFormParams.add("form1", form1); - if (form2 != null) + } + if (form2 != null) { localVarFormParams.add("form2", form2); - if (form3 != null) + } + if (form3 != null) { localVarFormParams.add("form3", form3); - if (form4 != null) + } + if (form4 != null) { localVarFormParams.add("form4", form4); - if (id != null) + } + if (id != null) { localVarFormParams.add("id", id); - if (name != null) + } + if (name != null) { localVarFormParams.add("name", name); + } final String[] localVarAccepts = { "text/plain" @@ -204,19 +209,18 @@ public ResponseEntity testFormOneofWithHttpInfo(@javax.annotation.Nullab String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/form/oneof", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/form/oneof", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "text/plain" @@ -229,6 +233,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/HeaderApi.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/HeaderApi.java index 6edcd27630ff..98d4465e26cf 100644 --- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/HeaderApi.java +++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/HeaderApi.java @@ -64,24 +64,28 @@ public String testHeaderIntegerBooleanStringEnums(@javax.annotation.Nullable Int * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testHeaderIntegerBooleanStringEnumsWithHttpInfo(@javax.annotation.Nullable Integer integerHeader, @javax.annotation.Nullable Boolean booleanHeader, @javax.annotation.Nullable String stringHeader, @javax.annotation.Nullable String enumNonrefStringHeader, @javax.annotation.Nullable StringEnumRef enumRefStringHeader) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); - - if (integerHeader != null) - localVarHeaderParams.add("integer_header", apiClient.parameterToString(integerHeader)); - if (booleanHeader != null) - localVarHeaderParams.add("boolean_header", apiClient.parameterToString(booleanHeader)); - if (stringHeader != null) - localVarHeaderParams.add("string_header", apiClient.parameterToString(stringHeader)); - if (enumNonrefStringHeader != null) - localVarHeaderParams.add("enum_nonref_string_header", apiClient.parameterToString(enumNonrefStringHeader)); - if (enumRefStringHeader != null) - localVarHeaderParams.add("enum_ref_string_header", apiClient.parameterToString(enumRefStringHeader)); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); + + if (integerHeader != null) { + localVarHeaderParams.add("integer_header", apiClient.parameterToString(integerHeader)); + } + if (booleanHeader != null) { + localVarHeaderParams.add("boolean_header", apiClient.parameterToString(booleanHeader)); + } + if (stringHeader != null) { + localVarHeaderParams.add("string_header", apiClient.parameterToString(stringHeader)); + } + if (enumNonrefStringHeader != null) { + localVarHeaderParams.add("enum_nonref_string_header", apiClient.parameterToString(enumNonrefStringHeader)); + } + if (enumRefStringHeader != null) { + localVarHeaderParams.add("enum_ref_string_header", apiClient.parameterToString(enumRefStringHeader)); + } final String[] localVarAccepts = { "text/plain" @@ -93,19 +97,18 @@ public ResponseEntity testHeaderIntegerBooleanStringEnumsWithHttpInfo(@j String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/header/integer/boolean/string/enums", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/header/integer/boolean/string/enums", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "text/plain" @@ -116,6 +119,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/PathApi.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/PathApi.java index 44e261d92aed..7defd995d24e 100644 --- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/PathApi.java +++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/PathApi.java @@ -62,7 +62,6 @@ public String testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnu * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathWithHttpInfo(@javax.annotation.Nonnull String pathString, @javax.annotation.Nonnull Integer pathInteger, @javax.annotation.Nonnull String enumNonrefStringPath, @javax.annotation.Nonnull StringEnumRef enumRefStringPath) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'pathString' is set if (pathString == null) { @@ -85,16 +84,16 @@ public ResponseEntity testsPathStringPathStringIntegerPathIntegerEnumNon } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("path_string", pathString); uriVariables.put("path_integer", pathInteger); uriVariables.put("enum_nonref_string_path", enumNonrefStringPath); uriVariables.put("enum_ref_string_path", enumRefStringPath); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "text/plain" @@ -106,19 +105,18 @@ public ResponseEntity testsPathStringPathStringIntegerPathIntegerEnumNon String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/path/string/{path_string}/integer/{path_integer}/{enum_nonref_string_path}/{enum_ref_string_path}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/path/string/{path_string}/integer/{path_integer}/{enum_nonref_string_path}/{enum_ref_string_path}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "text/plain" @@ -129,6 +127,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/QueryApi.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/QueryApi.java index 1c1d3f5c47a7..a2fdff57a866 100644 --- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/QueryApi.java +++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/api/QueryApi.java @@ -64,13 +64,12 @@ public String testEnumRefString(@javax.annotation.Nullable String enumNonrefStri * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testEnumRefStringWithHttpInfo(@javax.annotation.Nullable String enumNonrefStringQuery, @javax.annotation.Nullable StringEnumRef enumRefStringQuery) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_nonref_string_query", enumNonrefStringQuery)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_ref_string_query", enumRefStringQuery)); @@ -86,7 +85,7 @@ public ResponseEntity testEnumRefStringWithHttpInfo(@javax.annotation.Nu String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/query/enum_ref_string", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/query/enum_ref_string", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test query parameter(s) @@ -113,13 +112,12 @@ public String testQueryDatetimeDateString(@javax.annotation.Nullable OffsetDateT * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testQueryDatetimeDateStringWithHttpInfo(@javax.annotation.Nullable OffsetDateTime datetimeQuery, @javax.annotation.Nullable LocalDate dateQuery, @javax.annotation.Nullable String stringQuery) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "datetime_query", datetimeQuery)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "date_query", dateQuery)); @@ -136,7 +134,7 @@ public ResponseEntity testQueryDatetimeDateStringWithHttpInfo(@javax.ann String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/query/datetime/date/string", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/query/datetime/date/string", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test query parameter(s) @@ -163,13 +161,12 @@ public String testQueryIntegerBooleanString(@javax.annotation.Nullable Integer i * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testQueryIntegerBooleanStringWithHttpInfo(@javax.annotation.Nullable Integer integerQuery, @javax.annotation.Nullable Boolean booleanQuery, @javax.annotation.Nullable String stringQuery) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "integer_query", integerQuery)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "boolean_query", booleanQuery)); @@ -186,7 +183,7 @@ public ResponseEntity testQueryIntegerBooleanStringWithHttpInfo(@javax.a String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/query/integer/boolean/string", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/query/integer/boolean/string", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test query parameter(s) @@ -209,13 +206,12 @@ public String testQueryStyleDeepObjectExplodeTrueObject(@javax.annotation.Nullab * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testQueryStyleDeepObjectExplodeTrueObjectWithHttpInfo(@javax.annotation.Nullable Pet queryObject) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); if (queryObject != null) { @@ -237,7 +233,7 @@ public ResponseEntity testQueryStyleDeepObjectExplodeTrueObjectWithHttpI String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/query/style_deepObject/explode_true/object", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/query/style_deepObject/explode_true/object", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test query parameter(s) @@ -260,13 +256,12 @@ public String testQueryStyleDeepObjectExplodeTrueObjectAllOf(@javax.annotation.N * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testQueryStyleDeepObjectExplodeTrueObjectAllOfWithHttpInfo(@javax.annotation.Nullable TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter queryObject) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_object", queryObject)); @@ -281,7 +276,7 @@ public ResponseEntity testQueryStyleDeepObjectExplodeTrueObjectAllOfWith String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/query/style_deepObject/explode_true/object/allOf", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/query/style_deepObject/explode_true/object/allOf", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test query parameter(s) @@ -304,13 +299,12 @@ public String testQueryStyleFormExplodeFalseArrayInteger(@javax.annotation.Nulla * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testQueryStyleFormExplodeFalseArrayIntegerWithHttpInfo(@javax.annotation.Nullable List queryObject) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "query_object", queryObject)); @@ -325,7 +319,7 @@ public ResponseEntity testQueryStyleFormExplodeFalseArrayIntegerWithHttp String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/query/style_form/explode_false/array_integer", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/query/style_form/explode_false/array_integer", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test query parameter(s) @@ -348,13 +342,12 @@ public String testQueryStyleFormExplodeFalseArrayString(@javax.annotation.Nullab * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testQueryStyleFormExplodeFalseArrayStringWithHttpInfo(@javax.annotation.Nullable List queryObject) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "query_object", queryObject)); @@ -369,7 +362,7 @@ public ResponseEntity testQueryStyleFormExplodeFalseArrayStringWithHttpI String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/query/style_form/explode_false/array_string", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/query/style_form/explode_false/array_string", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test query parameter(s) @@ -392,13 +385,12 @@ public String testQueryStyleFormExplodeTrueArrayString(@javax.annotation.Nullabl * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testQueryStyleFormExplodeTrueArrayStringWithHttpInfo(@javax.annotation.Nullable TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter queryObject) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); if (queryObject != null) { @@ -415,7 +407,7 @@ public ResponseEntity testQueryStyleFormExplodeTrueArrayStringWithHttpIn String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/query/style_form/explode_true/array_string", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/query/style_form/explode_true/array_string", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test query parameter(s) @@ -438,13 +430,12 @@ public String testQueryStyleFormExplodeTrueObject(@javax.annotation.Nullable Pet * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testQueryStyleFormExplodeTrueObjectWithHttpInfo(@javax.annotation.Nullable Pet queryObject) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); if (queryObject != null) { @@ -466,7 +457,7 @@ public ResponseEntity testQueryStyleFormExplodeTrueObjectWithHttpInfo(@j String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/query/style_form/explode_true/object", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/query/style_form/explode_true/object", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test query parameter(s) @@ -489,13 +480,12 @@ public String testQueryStyleFormExplodeTrueObjectAllOf(@javax.annotation.Nullabl * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testQueryStyleFormExplodeTrueObjectAllOfWithHttpInfo(@javax.annotation.Nullable DataQuery queryObject) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_object", queryObject)); @@ -510,7 +500,7 @@ public ResponseEntity testQueryStyleFormExplodeTrueObjectAllOfWithHttpIn String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/query/style_form/explode_true/object/allOf", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/query/style_form/explode_true/object/allOf", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Test query parameter(s) @@ -535,13 +525,12 @@ public String testQueryStyleJsonSerializationObject(@javax.annotation.Nullable P * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testQueryStyleJsonSerializationObjectWithHttpInfo(@javax.annotation.Nullable Pet jsonSerializedObjectRefStringQuery, @javax.annotation.Nullable List jsonSerializedObjectArrayRefStringQuery) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "json_serialized_object_ref_string_query", jsonSerializedObjectRefStringQuery)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "json_serialized_object_array_ref_string_query", jsonSerializedObjectArrayRefStringQuery)); @@ -557,19 +546,18 @@ public ResponseEntity testQueryStyleJsonSerializationObjectWithHttpInfo( String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/query/style_jsonSerialization/object", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/query/style_jsonSerialization/object", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "text/plain" @@ -580,6 +568,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/others/go/oneof-not-enum/docs/EnumNullUnion.md b/samples/client/others/go/oneof-not-enum/docs/EnumNullUnion.md index 3dcae4fc7ccd..34b0d3134b3d 100644 --- a/samples/client/others/go/oneof-not-enum/docs/EnumNullUnion.md +++ b/samples/client/others/go/oneof-not-enum/docs/EnumNullUnion.md @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Kind** | Pointer to **string** | | [optional] +**Kind** | Pointer to **NullableString** | | [optional] ## Methods @@ -50,6 +50,16 @@ SetKind sets Kind field to given value. HasKind returns a boolean if a field has been set. +### SetKindNil + +`func (o *EnumNullUnion) SetKindNil(b bool)` + + SetKindNil sets the value for Kind to be an explicit nil + +### UnsetKind +`func (o *EnumNullUnion) UnsetKind()` + +UnsetKind ensures that no value is present for Kind, not even an explicit nil [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/api/BasApi.java b/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/api/BasApi.java index 12fe78400817..74749bcbdff3 100644 --- a/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/api/BasApi.java +++ b/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/api/BasApi.java @@ -59,7 +59,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createMessageRequestCreation(@jakarta.annotation.Nonnull File fileContent, @jakarta.annotation.Nonnull String idempotencyKey, @jakarta.annotation.Nonnull DataDirection dataDirection, @jakarta.annotation.Nonnull DataChannel dataChannel) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'fileContent' is set if (fileContent == null) { throw new RestClientResponseException("Missing the required parameter 'fileContent' when calling createMessage", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -84,14 +83,10 @@ private ResponseSpec createMessageRequestCreation(@jakarta.annotation.Nonnull Fi final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (fileContent != null) - formParams.add("fileContent", new FileSystemResource(fileContent)); - if (idempotencyKey != null) - formParams.add("idempotencyKey", idempotencyKey); - if (dataDirection != null) - formParams.add("dataDirection", dataDirection); - if (dataChannel != null) - formParams.add("dataChannel", dataChannel); + formParams.add("fileContent", new FileSystemResource(fileContent)); + formParams.add("idempotencyKey", idempotencyKey); + formParams.add("dataDirection", dataDirection); + formParams.add("dataChannel", dataChannel); final String[] localVarAccepts = { "application/json" @@ -105,7 +100,7 @@ private ResponseSpec createMessageRequestCreation(@jakarta.annotation.Nonnull Fi String[] localVarAuthNames = new String[] { "basicAuth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/messages", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/messages", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/others/java/restclient-jackson-default-impl/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/others/java/restclient-jackson-default-impl/src/main/java/org/openapitools/client/api/DefaultApi.java index d8d8513e628a..0387702b2dca 100644 --- a/samples/client/others/java/restclient-jackson-default-impl/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/others/java/restclient-jackson-default-impl/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -55,7 +55,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createAnimalRequestCreation(@jakarta.annotation.Nonnull Animal animal) throws RestClientResponseException { - Object postBody = animal; // verify the required parameter 'animal' is set if (animal == null) { throw new RestClientResponseException("Missing the required parameter 'animal' when calling createAnimal", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -80,7 +79,7 @@ private ResponseSpec createAnimalRequestCreation(@jakarta.annotation.Nonnull Ani String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/animals", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/animals", HttpMethod.POST, pathParams, localVarQueryParams, animal, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -130,7 +129,6 @@ public ResponseSpec createAnimalWithResponseSpec(@jakarta.annotation.Nonnull Ani * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createBeverageRequestCreation(@jakarta.annotation.Nonnull Beverage beverage) throws RestClientResponseException { - Object postBody = beverage; // verify the required parameter 'beverage' is set if (beverage == null) { throw new RestClientResponseException("Missing the required parameter 'beverage' when calling createBeverage", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -155,7 +153,7 @@ private ResponseSpec createBeverageRequestCreation(@jakarta.annotation.Nonnull B String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/beverages", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/beverages", HttpMethod.POST, pathParams, localVarQueryParams, beverage, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -205,7 +203,6 @@ public ResponseSpec createBeverageWithResponseSpec(@jakarta.annotation.Nonnull B * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createFruitRequestCreation(@jakarta.annotation.Nonnull Fruit fruit) throws RestClientResponseException { - Object postBody = fruit; // verify the required parameter 'fruit' is set if (fruit == null) { throw new RestClientResponseException("Missing the required parameter 'fruit' when calling createFruit", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -230,7 +227,7 @@ private ResponseSpec createFruitRequestCreation(@jakarta.annotation.Nonnull Frui String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fruits", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fruits", HttpMethod.POST, pathParams, localVarQueryParams, fruit, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/others/java/restclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java b/samples/client/others/java/restclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java index 9b09ba12f667..945bd0c712cb 100644 --- a/samples/client/others/java/restclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java +++ b/samples/client/others/java/restclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java @@ -54,7 +54,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createBarRequestCreation(@jakarta.annotation.Nonnull BarCreate barCreate) throws RestClientResponseException { - Object postBody = barCreate; // verify the required parameter 'barCreate' is set if (barCreate == null) { throw new RestClientResponseException("Missing the required parameter 'barCreate' when calling createBar", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -79,7 +78,7 @@ private ResponseSpec createBarRequestCreation(@jakarta.annotation.Nonnull BarCre String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/bar", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/bar", HttpMethod.POST, pathParams, localVarQueryParams, barCreate, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/others/java/restclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java b/samples/client/others/java/restclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java index e719dc5a9387..d1edf368d1e4 100644 --- a/samples/client/others/java/restclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java +++ b/samples/client/others/java/restclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java @@ -54,7 +54,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createFooRequestCreation(@jakarta.annotation.Nullable Foo foo) throws RestClientResponseException { - Object postBody = foo; // create path and map variables final Map pathParams = new HashMap<>(); @@ -75,7 +74,7 @@ private ResponseSpec createFooRequestCreation(@jakarta.annotation.Nullable Foo f String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/foo", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.POST, pathParams, localVarQueryParams, foo, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -124,7 +123,6 @@ public ResponseSpec createFooWithResponseSpec(@jakarta.annotation.Nullable Foo f * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getAllFoosRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -143,7 +141,7 @@ private ResponseSpec getAllFoosRequestCreation() throws RestClientResponseExcept String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/others/java/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java b/samples/client/others/java/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java index 1d6ab29e9492..c08adb0054e7 100644 --- a/samples/client/others/java/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java +++ b/samples/client/others/java/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java @@ -52,7 +52,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec resourceInResponseRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -71,7 +70,7 @@ private ResponseSpec resourceInResponseRequestCreation() throws RestClientRespon String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/resource", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/resource", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/others/java/resttemplate-list-schema-validation/pom.xml b/samples/client/others/java/resttemplate-list-schema-validation/pom.xml index ffd5ca771488..fdca8e72f0a9 100644 --- a/samples/client/others/java/resttemplate-list-schema-validation/pom.xml +++ b/samples/client/others/java/resttemplate-list-schema-validation/pom.xml @@ -145,10 +145,8 @@ maven-compiler-plugin 3.11.0 - 1.8 1.8 - diff --git a/samples/client/others/java/resttemplate-list-schema-validation/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/others/java/resttemplate-list-schema-validation/src/main/java/org/openapitools/client/api/UserApi.java index 16f0dd8f36f4..8df7e27a3a85 100644 --- a/samples/client/others/java/resttemplate-list-schema-validation/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/others/java/resttemplate-list-schema-validation/src/main/java/org/openapitools/client/api/UserApi.java @@ -59,7 +59,6 @@ public User userGet(@javax.annotation.Nonnull List<@Pattern(regexp = "^[a-zA-Z0- * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity userGetWithHttpInfo(@javax.annotation.Nonnull List<@Pattern(regexp = "^[a-zA-Z0-9]$")String> username) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -67,13 +66,13 @@ public ResponseEntity userGetWithHttpInfo(@javax.annotation.Nonnull List<@ } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", apiClient.collectionPathParameterToString(ApiClient.CollectionFormat.valueOf("csv".toUpperCase()), username)); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -85,19 +84,18 @@ public ResponseEntity userGetWithHttpInfo(@javax.annotation.Nonnull List<@ String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -108,6 +106,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/others/java/resttemplate-useAbstractionForFiles/pom.xml b/samples/client/others/java/resttemplate-useAbstractionForFiles/pom.xml index 623d72131b3d..93e3edcf2f9f 100644 --- a/samples/client/others/java/resttemplate-useAbstractionForFiles/pom.xml +++ b/samples/client/others/java/resttemplate-useAbstractionForFiles/pom.xml @@ -145,10 +145,8 @@ maven-compiler-plugin 3.11.0 - 1.8 1.8 - diff --git a/samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java b/samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java index 2bc196ebe71a..30745ed1bd79 100644 --- a/samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java +++ b/samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java @@ -54,13 +54,12 @@ public org.springframework.core.io.Resource resourceInResponse() throws RestClie * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity resourceInResponseWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/octet-stream" @@ -72,19 +71,18 @@ public ResponseEntity resourceInResponseWi String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/resource", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/resource", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/octet-stream" @@ -95,6 +93,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java index 991790ebf692..a6a8a09560bb 100644 --- a/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java +++ b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java @@ -56,18 +56,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createBarRequestCreation(@javax.annotation.Nonnull BarCreate barCreate) throws WebClientResponseException { - Object postBody = barCreate; // verify the required parameter 'barCreate' is set if (barCreate == null) { throw new WebClientResponseException("Missing the required parameter 'barCreate' when calling createBar", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -80,8 +79,8 @@ private ResponseSpec createBarRequestCreation(@javax.annotation.Nonnull BarCreat String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/bar", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/bar", HttpMethod.POST, pathParams, localVarQueryParams, barCreate, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -93,7 +92,7 @@ private ResponseSpec createBarRequestCreation(@javax.annotation.Nonnull BarCreat * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono createBar(@javax.annotation.Nonnull BarCreate barCreate) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return createBarRequestCreation(barCreate).bodyToMono(localVarReturnType); } @@ -106,7 +105,7 @@ public Mono createBar(@javax.annotation.Nonnull BarCreate barCreate) throws * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> createBarWithHttpInfo(@javax.annotation.Nonnull BarCreate barCreate) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return createBarRequestCreation(barCreate).toEntity(localVarReturnType); } diff --git a/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java index 149184d674e7..2cfa8bda3226 100644 --- a/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java +++ b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java @@ -56,14 +56,13 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createFooRequestCreation(@javax.annotation.Nullable Foo foo) throws WebClientResponseException { - Object postBody = foo; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -76,8 +75,8 @@ private ResponseSpec createFooRequestCreation(@javax.annotation.Nullable Foo foo String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/foo", HttpMethod.POST, pathParams, localVarQueryParams, foo, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -89,7 +88,7 @@ private ResponseSpec createFooRequestCreation(@javax.annotation.Nullable Foo foo * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono createFoo(@javax.annotation.Nullable Foo foo) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return createFooRequestCreation(foo).bodyToMono(localVarReturnType); } @@ -102,7 +101,7 @@ public Mono createFoo(@javax.annotation.Nullable Foo foo) throws * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> createFooWithHttpInfo(@javax.annotation.Nullable Foo foo) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return createFooRequestCreation(foo).toEntity(localVarReturnType); } @@ -126,14 +125,13 @@ public ResponseSpec createFooWithResponseSpec(@javax.annotation.Nullable Foo foo * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getAllFoosRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json;charset=utf-8" @@ -144,8 +142,8 @@ private ResponseSpec getAllFoosRequestCreation() throws WebClientResponseExcepti String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -156,7 +154,7 @@ private ResponseSpec getAllFoosRequestCreation() throws WebClientResponseExcepti * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Flux getAllFoos() throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return getAllFoosRequestCreation().bodyToFlux(localVarReturnType); } @@ -168,7 +166,7 @@ public Flux getAllFoos() throws WebClientResponseException { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono>> getAllFoosWithHttpInfo() throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return getAllFoosRequestCreation().toEntityList(localVarReturnType); } diff --git a/samples/client/others/java/webclient-sealedInterface_3_1/src/main/java/org/openapitools/client/api/BarApi.java b/samples/client/others/java/webclient-sealedInterface_3_1/src/main/java/org/openapitools/client/api/BarApi.java index 991790ebf692..a6a8a09560bb 100644 --- a/samples/client/others/java/webclient-sealedInterface_3_1/src/main/java/org/openapitools/client/api/BarApi.java +++ b/samples/client/others/java/webclient-sealedInterface_3_1/src/main/java/org/openapitools/client/api/BarApi.java @@ -56,18 +56,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createBarRequestCreation(@javax.annotation.Nonnull BarCreate barCreate) throws WebClientResponseException { - Object postBody = barCreate; // verify the required parameter 'barCreate' is set if (barCreate == null) { throw new WebClientResponseException("Missing the required parameter 'barCreate' when calling createBar", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -80,8 +79,8 @@ private ResponseSpec createBarRequestCreation(@javax.annotation.Nonnull BarCreat String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/bar", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/bar", HttpMethod.POST, pathParams, localVarQueryParams, barCreate, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -93,7 +92,7 @@ private ResponseSpec createBarRequestCreation(@javax.annotation.Nonnull BarCreat * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono createBar(@javax.annotation.Nonnull BarCreate barCreate) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return createBarRequestCreation(barCreate).bodyToMono(localVarReturnType); } @@ -106,7 +105,7 @@ public Mono createBar(@javax.annotation.Nonnull BarCreate barCreate) throws * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> createBarWithHttpInfo(@javax.annotation.Nonnull BarCreate barCreate) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return createBarRequestCreation(barCreate).toEntity(localVarReturnType); } diff --git a/samples/client/others/java/webclient-sealedInterface_3_1/src/main/java/org/openapitools/client/api/FooApi.java b/samples/client/others/java/webclient-sealedInterface_3_1/src/main/java/org/openapitools/client/api/FooApi.java index 149184d674e7..2cfa8bda3226 100644 --- a/samples/client/others/java/webclient-sealedInterface_3_1/src/main/java/org/openapitools/client/api/FooApi.java +++ b/samples/client/others/java/webclient-sealedInterface_3_1/src/main/java/org/openapitools/client/api/FooApi.java @@ -56,14 +56,13 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createFooRequestCreation(@javax.annotation.Nullable Foo foo) throws WebClientResponseException { - Object postBody = foo; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -76,8 +75,8 @@ private ResponseSpec createFooRequestCreation(@javax.annotation.Nullable Foo foo String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/foo", HttpMethod.POST, pathParams, localVarQueryParams, foo, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -89,7 +88,7 @@ private ResponseSpec createFooRequestCreation(@javax.annotation.Nullable Foo foo * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono createFoo(@javax.annotation.Nullable Foo foo) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return createFooRequestCreation(foo).bodyToMono(localVarReturnType); } @@ -102,7 +101,7 @@ public Mono createFoo(@javax.annotation.Nullable Foo foo) throws * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> createFooWithHttpInfo(@javax.annotation.Nullable Foo foo) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return createFooRequestCreation(foo).toEntity(localVarReturnType); } @@ -126,14 +125,13 @@ public ResponseSpec createFooWithResponseSpec(@javax.annotation.Nullable Foo foo * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getAllFoosRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json;charset=utf-8" @@ -144,8 +142,8 @@ private ResponseSpec getAllFoosRequestCreation() throws WebClientResponseExcepti String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -156,7 +154,7 @@ private ResponseSpec getAllFoosRequestCreation() throws WebClientResponseExcepti * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Flux getAllFoos() throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return getAllFoosRequestCreation().bodyToFlux(localVarReturnType); } @@ -168,7 +166,7 @@ public Flux getAllFoos() throws WebClientResponseException { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono>> getAllFoosWithHttpInfo() throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return getAllFoosRequestCreation().toEntityList(localVarReturnType); } diff --git a/samples/client/others/java/webclient-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java b/samples/client/others/java/webclient-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java index 8afb2e6a1e62..fc3905d50329 100644 --- a/samples/client/others/java/webclient-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java +++ b/samples/client/others/java/webclient-useAbstractionForFiles/src/main/java/org/openapitools/client/api/ResourceApi.java @@ -54,14 +54,13 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec resourceInResponseRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/octet-stream" @@ -73,7 +72,7 @@ private ResponseSpec resourceInResponseRequestCreation() throws WebClientRespons String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/resource", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/resource", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java index 2fbb14190c85..3a94a7b6d749 100644 --- a/samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -52,7 +52,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec nullableArrayTestGetRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -71,7 +70,7 @@ private ResponseSpec nullableArrayTestGetRequestCreation() throws RestClientResp String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/nullable-array-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/nullable-array-test", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/restclient-springBoot4-jackson2/src/main/java/org/openapitools/client/api/PetApi.java index 9ef8f931129d..4c6d2f74569d 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson2/src/main/java/org/openapitools/client/api/PetApi.java @@ -54,7 +54,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) throws RestClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new RestClientResponseException("Missing the required parameter 'pet' when calling addPet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -79,7 +78,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/FileApi.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/FileApi.java index 95651ecf3af2..a977ff30748e 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/FileApi.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/FileApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fileIdGetRequestCreation(String id) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'id' is set if (id == null) { throw new RestClientResponseException("Missing the required parameter 'id' when calling fileIdGet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -78,7 +77,7 @@ private ResponseSpec fileIdGetRequestCreation(String id) throws RestClientRespon String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/file/{id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/file/{id}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/FooApi.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/FooApi.java index 6515d9118d18..8cd1dc794c5a 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/FooApi.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/FooApi.java @@ -96,7 +96,6 @@ public ResponseSpec fooDtParamGetWithResponseSpec(FooDtParamGetRequest requestPa * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -122,7 +121,7 @@ private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dt String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/foo/{dtParam}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo/{dtParam}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java index fb14eed980f0..3b2e777fce9a 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec requiredAndNullablePostRequestCreation(RequiredAndNullable requiredAndNullable) throws RestClientResponseException { - Object postBody = requiredAndNullable; // verify the required parameter 'requiredAndNullable' is set if (requiredAndNullable == null) { throw new RestClientResponseException("Missing the required parameter 'requiredAndNullable' when calling requiredAndNullablePost", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -78,7 +77,7 @@ private ResponseSpec requiredAndNullablePostRequestCreation(RequiredAndNullable String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/requiredAndNullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/requiredAndNullable", HttpMethod.POST, pathParams, localVarQueryParams, requiredAndNullable, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/UploadApi.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/UploadApi.java index 2c0d8ffe4cda..23aa57641680 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/UploadApi.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/UploadApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFilesPostRequestCreation(@Nullable List _file) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -62,8 +61,9 @@ private ResponseSpec uploadFilesPostRequestCreation(@Nullable List _file) final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (_file != null) + if (_file != null) { formParams.addAll("file", _file.stream().map(FileSystemResource::new).collect(Collectors.toList())); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -75,7 +75,7 @@ private ResponseSpec uploadFilesPostRequestCreation(@Nullable List _file) String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/uploadFiles", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/uploadFiles", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -122,7 +122,6 @@ public ResponseSpec uploadFilesPostWithResponseSpec(@Nullable List _file) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadPostRequestCreation(@Nullable File _file) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -131,8 +130,9 @@ private ResponseSpec uploadPostRequestCreation(@Nullable File _file) throws Rest final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (_file != null) + if (_file != null) { formParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -144,7 +144,7 @@ private ResponseSpec uploadPostRequestCreation(@Nullable File _file) throws Rest String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/upload", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/upload", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FileApi.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FileApi.java index 95651ecf3af2..a977ff30748e 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FileApi.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FileApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fileIdGetRequestCreation(String id) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'id' is set if (id == null) { throw new RestClientResponseException("Missing the required parameter 'id' when calling fileIdGet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -78,7 +77,7 @@ private ResponseSpec fileIdGetRequestCreation(String id) throws RestClientRespon String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/file/{id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/file/{id}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FooApi.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FooApi.java index 6515d9118d18..8cd1dc794c5a 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FooApi.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FooApi.java @@ -96,7 +96,6 @@ public ResponseSpec fooDtParamGetWithResponseSpec(FooDtParamGetRequest requestPa * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -122,7 +121,7 @@ private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dt String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/foo/{dtParam}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo/{dtParam}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java index fb14eed980f0..3b2e777fce9a 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec requiredAndNullablePostRequestCreation(RequiredAndNullable requiredAndNullable) throws RestClientResponseException { - Object postBody = requiredAndNullable; // verify the required parameter 'requiredAndNullable' is set if (requiredAndNullable == null) { throw new RestClientResponseException("Missing the required parameter 'requiredAndNullable' when calling requiredAndNullablePost", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -78,7 +77,7 @@ private ResponseSpec requiredAndNullablePostRequestCreation(RequiredAndNullable String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/requiredAndNullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/requiredAndNullable", HttpMethod.POST, pathParams, localVarQueryParams, requiredAndNullable, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/UploadApi.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/UploadApi.java index dfe828413439..fa66f7bde072 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/UploadApi.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/UploadApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFilesPostRequestCreation(java.util.@Nullable Collection _file) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -62,8 +61,9 @@ private ResponseSpec uploadFilesPostRequestCreation(java.util.@Nullable Collecti final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (_file != null) + if (_file != null) { formParams.addAll("file", _file.stream().collect(Collectors.toList())); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -75,7 +75,7 @@ private ResponseSpec uploadFilesPostRequestCreation(java.util.@Nullable Collecti String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/uploadFiles", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/uploadFiles", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -122,7 +122,6 @@ public ResponseSpec uploadFilesPostWithResponseSpec(java.util.@Nullable Collecti * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadPostRequestCreation(org.springframework.core.io.@Nullable Resource _file) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -131,8 +130,9 @@ private ResponseSpec uploadPostRequestCreation(org.springframework.core.io.@Null final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (_file != null) + if (_file != null) { formParams.add("file", _file); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -144,7 +144,7 @@ private ResponseSpec uploadPostRequestCreation(org.springframework.core.io.@Null String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/upload", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/upload", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/restclient-springBoot4-jackson3/src/main/java/org/openapitools/client/api/PetApi.java index 9ef8f931129d..4c6d2f74569d 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3/src/main/java/org/openapitools/client/api/PetApi.java @@ -54,7 +54,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) throws RestClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new RestClientResponseException("Missing the required parameter 'pet' when calling addPet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -79,7 +78,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 11f7658880b6..afb639b82059 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.Nonnull Client client) throws RestClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new RestClientResponseException("Missing the required parameter 'client' when calling call123testSpecialTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -78,7 +77,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/DefaultApi.java index a6e59e8312a6..7a8afe2fc202 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -52,7 +52,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -71,7 +70,7 @@ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java index 04430f0b8fad..94d28674fdbc 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -66,7 +66,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -85,7 +84,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientRespons String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -131,7 +130,6 @@ public ResponseSpec fakeBigDecimalMapWithResponseSpec() throws RestClientRespons * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -150,7 +148,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseExc String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -198,7 +196,6 @@ public ResponseSpec fakeHealthGetWithResponseSpec() throws RestClientResponseExc * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.Nonnull Pet pet, @jakarta.annotation.Nullable String query1, @jakarta.annotation.Nullable String header1) throws RestClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new RestClientResponseException("Missing the required parameter 'pet' when calling fakeHttpSignatureTest", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -213,8 +210,10 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); - if (header1 != null) - headerParams.add("header_1", apiClient.parameterToString(header1)); + if (header1 != null) { + headerParams.add("header_1", apiClient.parameterToString(header1)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { @@ -225,7 +224,7 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No String[] localVarAuthNames = new String[] { "http_signature_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -279,7 +278,6 @@ public ResponseSpec fakeHttpSignatureTestWithResponseSpec(@jakarta.annotation.No * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotation.Nullable Boolean body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -300,7 +298,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -350,7 +348,6 @@ public ResponseSpec fakeOuterBooleanSerializeWithResponseSpec(@jakarta.annotatio * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotation.Nullable OuterComposite outerComposite) throws RestClientResponseException { - Object postBody = outerComposite; // create path and map variables final Map pathParams = new HashMap<>(); @@ -371,7 +368,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, outerComposite, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -421,7 +418,6 @@ public ResponseSpec fakeOuterCompositeSerializeWithResponseSpec(@jakarta.annotat * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation.Nullable BigDecimal body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -442,7 +438,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -492,7 +488,6 @@ public ResponseSpec fakeOuterNumberSerializeWithResponseSpec(@jakarta.annotation * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation.Nullable String body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -513,7 +508,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -563,7 +558,6 @@ public ResponseSpec fakeOuterStringSerializeWithResponseSpec(@jakarta.annotation * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.annotation.Nonnull OuterObjectWithEnumProperty outerObjectWithEnumProperty) throws RestClientResponseException { - Object postBody = outerObjectWithEnumProperty; // verify the required parameter 'outerObjectWithEnumProperty' is set if (outerObjectWithEnumProperty == null) { throw new RestClientResponseException("Missing the required parameter 'outerObjectWithEnumProperty' when calling fakePropertyEnumIntegerSerialize", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -588,7 +582,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, outerObjectWithEnumProperty, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -637,7 +631,6 @@ public ResponseSpec fakePropertyEnumIntegerSerializeWithResponseSpec(@jakarta.an * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws RestClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new RestClientResponseException("Missing the required parameter 'requestBody' when calling testAdditionalPropertiesReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -660,7 +653,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -707,7 +700,6 @@ public ResponseSpec testAdditionalPropertiesReferenceWithResponseSpec(@jakarta.a * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nullable File body) throws RestClientResponseException { - Object postBody = body; // verify the required parameter 'body' is set if (body == null) { throw new RestClientResponseException("Missing the required parameter 'body' when calling testBodyWithBinary", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -730,7 +722,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -777,7 +769,6 @@ public ResponseSpec testBodyWithBinaryWithResponseSpec(@jakarta.annotation.Nulla * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.Nonnull FileSchemaTestClass fileSchemaTestClass) throws RestClientResponseException { - Object postBody = fileSchemaTestClass; // verify the required parameter 'fileSchemaTestClass' is set if (fileSchemaTestClass == null) { throw new RestClientResponseException("Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -800,7 +791,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, fileSchemaTestClass, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -848,7 +839,6 @@ public ResponseSpec testBodyWithFileSchemaWithResponseSpec(@jakarta.annotation.N * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation.Nonnull String query, @jakarta.annotation.Nonnull User user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'query' is set if (query == null) { throw new RestClientResponseException("Missing the required parameter 'query' when calling testBodyWithQueryParams", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -877,7 +867,7 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -928,7 +918,6 @@ public ResponseSpec testBodyWithQueryParamsWithResponseSpec(@jakarta.annotation. * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull Client client) throws RestClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new RestClientResponseException("Missing the required parameter 'client' when calling testClientModel", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -953,7 +942,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1016,7 +1005,6 @@ public ResponseSpec testClientModelWithResponseSpec(@jakarta.annotation.Nonnull * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.Nonnull BigDecimal number, @jakarta.annotation.Nonnull Double _double, @jakarta.annotation.Nonnull String patternWithoutDelimiter, @jakarta.annotation.Nonnull byte[] _byte, @jakarta.annotation.Nullable Integer integer, @jakarta.annotation.Nullable Integer int32, @jakarta.annotation.Nullable Long int64, @jakarta.annotation.Nullable Float _float, @jakarta.annotation.Nullable String string, @jakarta.annotation.Nullable File binary, @jakarta.annotation.Nullable LocalDate date, @jakarta.annotation.Nullable OffsetDateTime dateTime, @jakarta.annotation.Nullable String password, @jakarta.annotation.Nullable String paramCallback) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'number' is set if (number == null) { throw new RestClientResponseException("Missing the required parameter 'number' when calling testEndpointParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1041,34 +1029,40 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (integer != null) + if (integer != null) { formParams.add("integer", integer); - if (int32 != null) + } + if (int32 != null) { formParams.add("int32", int32); - if (int64 != null) + } + if (int64 != null) { formParams.add("int64", int64); - if (number != null) - formParams.add("number", number); - if (_float != null) + } + formParams.add("number", number); + if (_float != null) { formParams.add("float", _float); - if (_double != null) - formParams.add("double", _double); - if (string != null) + } + formParams.add("double", _double); + if (string != null) { formParams.add("string", string); - if (patternWithoutDelimiter != null) - formParams.add("pattern_without_delimiter", patternWithoutDelimiter); - if (_byte != null) - formParams.add("byte", _byte); - if (binary != null) + } + formParams.add("pattern_without_delimiter", patternWithoutDelimiter); + formParams.add("byte", _byte); + if (binary != null) { formParams.add("binary", new FileSystemResource(binary)); - if (date != null) + } + if (date != null) { formParams.add("date", date); - if (dateTime != null) + } + if (dateTime != null) { formParams.add("dateTime", dateTime); - if (password != null) + } + if (password != null) { formParams.add("password", password); - if (paramCallback != null) + } + if (paramCallback != null) { formParams.add("callback", paramCallback); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1080,7 +1074,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { "http_basic_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1178,7 +1172,6 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@jakarta.annotation.N * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -1193,14 +1186,19 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); - if (enumHeaderStringArray != null) - headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); - if (enumHeaderString != null) - headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); - if (enumFormStringArray != null) + if (enumHeaderStringArray != null) { + headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); + } + if (enumHeaderString != null) { + headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + } + + if (enumFormStringArray != null) { formParams.addAll("enum_form_string_array", enumFormStringArray); - if (enumFormString != null) + } + if (enumFormString != null) { formParams.add("enum_form_string", enumFormString); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1212,7 +1210,7 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1291,7 +1289,6 @@ public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nulla * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonnull Integer requiredStringGroup, @jakarta.annotation.Nonnull Boolean requiredBooleanGroup, @jakarta.annotation.Nonnull Long requiredInt64Group, @jakarta.annotation.Nullable Integer stringGroup, @jakarta.annotation.Nullable Boolean booleanGroup, @jakarta.annotation.Nullable Long int64Group) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'requiredStringGroup' is set if (requiredStringGroup == null) { throw new RestClientResponseException("Missing the required parameter 'requiredStringGroup' when calling testGroupParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1317,10 +1314,11 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); - if (requiredBooleanGroup != null) headerParams.add("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); - if (booleanGroup != null) - headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + if (booleanGroup != null) { + headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -1329,7 +1327,7 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1391,7 +1389,6 @@ public ResponseSpec testGroupParametersWithResponseSpec(@jakarta.annotation.Nonn * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws RestClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new RestClientResponseException("Missing the required parameter 'requestBody' when calling testInlineAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1414,7 +1411,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1461,7 +1458,6 @@ public ResponseSpec testInlineAdditionalPropertiesWithResponseSpec(@jakarta.anno * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jakarta.annotation.Nonnull TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest) throws RestClientResponseException { - Object postBody = testInlineFreeformAdditionalPropertiesRequest; // verify the required parameter 'testInlineFreeformAdditionalPropertiesRequest' is set if (testInlineFreeformAdditionalPropertiesRequest == null) { throw new RestClientResponseException("Missing the required parameter 'testInlineFreeformAdditionalPropertiesRequest' when calling testInlineFreeformAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1484,7 +1480,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, testInlineFreeformAdditionalPropertiesRequest, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1532,7 +1528,6 @@ public ResponseSpec testInlineFreeformAdditionalPropertiesWithResponseSpec(@jaka * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String param, @jakarta.annotation.Nonnull String param2) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'param' is set if (param == null) { throw new RestClientResponseException("Missing the required parameter 'param' when calling testJsonFormData", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1549,10 +1544,8 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (param != null) - formParams.add("param", param); - if (param2 != null) - formParams.add("param2", param2); + formParams.add("param", param); + formParams.add("param2", param2); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1564,7 +1557,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1614,7 +1607,6 @@ public ResponseSpec testJsonFormDataWithResponseSpec(@jakarta.annotation.Nonnull * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull ChildWithNullable childWithNullable) throws RestClientResponseException { - Object postBody = childWithNullable; // verify the required parameter 'childWithNullable' is set if (childWithNullable == null) { throw new RestClientResponseException("Missing the required parameter 'childWithNullable' when calling testNullable", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1637,7 +1629,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, childWithNullable, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1690,7 +1682,6 @@ public ResponseSpec testNullableWithResponseSpec(@jakarta.annotation.Nonnull Chi * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta.annotation.Nonnull List pipe, @jakarta.annotation.Nonnull List ioutil, @jakarta.annotation.Nonnull List http, @jakarta.annotation.Nonnull List url, @jakarta.annotation.Nonnull List context, @jakarta.annotation.Nonnull String allowEmpty, @jakarta.annotation.Nullable Map language) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'pipe' is set if (pipe == null) { throw new RestClientResponseException("Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1739,7 +1730,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1804,7 +1795,6 @@ public ResponseSpec testQueryParameterCollectionFormatWithResponseSpec(@jakarta. * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws RestClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new RestClientResponseException("Missing the required parameter 'requestBody' when calling testStringMapReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1827,7 +1817,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 9e689558f312..180e13e69ef3 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Client client) throws RestClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new RestClientResponseException("Missing the required parameter 'client' when calling testClassname", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -78,7 +77,7 @@ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Cl String[] localVarAuthNames = new String[] { "api_key_query" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/PetApi.java index 8241c901aea5..92f7c33ac6a4 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/PetApi.java @@ -56,7 +56,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) throws RestClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new RestClientResponseException("Missing the required parameter 'pet' when calling addPet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -79,7 +78,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -131,7 +130,6 @@ public ResponseSpec addPetWithResponseSpec(@jakarta.annotation.Nonnull Pet pet) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String apiKey) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling deletePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -146,8 +144,10 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (apiKey != null) - headerParams.add("api_key", apiClient.parameterToString(apiKey)); + if (apiKey != null) { + headerParams.add("api_key", apiClient.parameterToString(apiKey)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -156,7 +156,7 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -211,7 +211,6 @@ public ResponseSpec deletePetWithResponseSpec(@jakarta.annotation.Nonnull Long p * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull List status) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'status' is set if (status == null) { throw new RestClientResponseException("Missing the required parameter 'status' when calling findPetsByStatus", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -236,7 +235,7 @@ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -290,7 +289,6 @@ public ResponseSpec findPetsByStatusWithResponseSpec(@jakarta.annotation.Nonnull * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull Set tags) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'tags' is set if (tags == null) { throw new RestClientResponseException("Missing the required parameter 'tags' when calling findPetsByTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -315,7 +313,7 @@ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull S String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -376,7 +374,6 @@ public ResponseSpec findPetsByTagsWithResponseSpec(@jakarta.annotation.Nonnull S * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long petId) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling getPetById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -401,7 +398,7 @@ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -459,7 +456,6 @@ public ResponseSpec getPetByIdWithResponseSpec(@jakarta.annotation.Nonnull Long * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pet) throws RestClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new RestClientResponseException("Missing the required parameter 'pet' when calling updatePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -482,7 +478,7 @@ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pe String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -541,7 +537,6 @@ public ResponseSpec updatePetWithResponseSpec(@jakarta.annotation.Nonnull Pet pe * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String name, @jakarta.annotation.Nullable String status) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling updatePetWithForm", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -556,10 +551,12 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (name != null) + if (name != null) { formParams.add("name", name); - if (status != null) + } + if (status != null) { formParams.add("status", status); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -571,7 +568,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -630,7 +627,6 @@ public ResponseSpec updatePetWithFormWithResponseSpec(@jakarta.annotation.Nonnul * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String additionalMetadata, @jakarta.annotation.Nullable File _file) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling uploadFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -645,10 +641,12 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (_file != null) + } + if (_file != null) { formParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { "application/json" @@ -662,7 +660,7 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -720,7 +718,6 @@ public ResponseSpec uploadFileWithResponseSpec(@jakarta.annotation.Nonnull Long * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nonnull File requiredFile, @jakarta.annotation.Nullable String additionalMetadata) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling uploadFileWithRequiredFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -739,10 +736,10 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (requiredFile != null) - formParams.add("requiredFile", new FileSystemResource(requiredFile)); + } + formParams.add("requiredFile", new FileSystemResource(requiredFile)); final String[] localVarAccepts = { "application/json" @@ -756,7 +753,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/StoreApi.java index 3d92a323235a..47427feb6bbc 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/StoreApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull String orderId) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new RestClientResponseException("Missing the required parameter 'orderId' when calling deleteOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -76,7 +75,7 @@ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull Stri String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -126,7 +125,6 @@ public ResponseSpec deleteOrderWithResponseSpec(@jakarta.annotation.Nonnull Stri * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -145,7 +143,7 @@ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseExce String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -194,7 +192,6 @@ public ResponseSpec getInventoryWithResponseSpec() throws RestClientResponseExce * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Long orderId) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new RestClientResponseException("Missing the required parameter 'orderId' when calling getOrderById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -219,7 +216,7 @@ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Lon String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -276,7 +273,6 @@ public ResponseSpec getOrderByIdWithResponseSpec(@jakarta.annotation.Nonnull Lon * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order order) throws RestClientResponseException { - Object postBody = order; // verify the required parameter 'order' is set if (order == null) { throw new RestClientResponseException("Missing the required parameter 'order' when calling placeOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -301,7 +297,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, order, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/UserApi.java index 4ea56b7257bd..f9d2cd8e80a3 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/UserApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new RestClientResponseException("Missing the required parameter 'user' when calling createUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -76,7 +75,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -123,7 +122,6 @@ public ResponseSpec createUserWithResponseSpec(@jakarta.annotation.Nonnull User * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotation.Nonnull List user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new RestClientResponseException("Missing the required parameter 'user' when calling createUsersWithArrayInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -146,7 +144,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -193,7 +191,6 @@ public ResponseSpec createUsersWithArrayInputWithResponseSpec(@jakarta.annotatio * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation.Nonnull List user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new RestClientResponseException("Missing the required parameter 'user' when calling createUsersWithListInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -216,7 +213,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -264,7 +261,6 @@ public ResponseSpec createUsersWithListInputWithResponseSpec(@jakarta.annotation * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull String username) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling deleteUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -287,7 +283,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -340,7 +336,6 @@ public ResponseSpec deleteUserWithResponseSpec(@jakarta.annotation.Nonnull Strin * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull String username) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling getUserByName", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -365,7 +360,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -423,7 +418,6 @@ public ResponseSpec getUserByNameWithResponseSpec(@jakarta.annotation.Nonnull St * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull String password) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling loginUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -453,7 +447,7 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -507,7 +501,6 @@ public ResponseSpec loginUserWithResponseSpec(@jakarta.annotation.Nonnull String * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -524,7 +517,7 @@ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseExcept String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -570,7 +563,6 @@ public ResponseSpec logoutUserWithResponseSpec() throws RestClientResponseExcept * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull User user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling updateUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -599,7 +591,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 11f7658880b6..afb639b82059 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.Nonnull Client client) throws RestClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new RestClientResponseException("Missing the required parameter 'client' when calling call123testSpecialTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -78,7 +77,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/DefaultApi.java index a6e59e8312a6..7a8afe2fc202 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -52,7 +52,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -71,7 +70,7 @@ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeApi.java index dbe6f8358f33..7f3b128bea59 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeApi.java @@ -66,7 +66,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -85,7 +84,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientRespons String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -131,7 +130,6 @@ public ResponseSpec fakeBigDecimalMapWithResponseSpec() throws RestClientRespons * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -150,7 +148,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseExc String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -308,7 +306,6 @@ public ResponseSpec fakeHttpSignatureTestWithResponseSpec(FakeHttpSignatureTestR * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.Nonnull Pet pet, @jakarta.annotation.Nullable String query1, @jakarta.annotation.Nullable String header1) throws RestClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new RestClientResponseException("Missing the required parameter 'pet' when calling fakeHttpSignatureTest", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -323,8 +320,10 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); - if (header1 != null) - headerParams.add("header_1", apiClient.parameterToString(header1)); + if (header1 != null) { + headerParams.add("header_1", apiClient.parameterToString(header1)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { @@ -335,7 +334,7 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No String[] localVarAuthNames = new String[] { "http_signature_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -389,7 +388,6 @@ public ResponseSpec fakeHttpSignatureTestWithResponseSpec(@jakarta.annotation.No * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotation.Nullable Boolean body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -410,7 +408,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -460,7 +458,6 @@ public ResponseSpec fakeOuterBooleanSerializeWithResponseSpec(@jakarta.annotatio * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotation.Nullable OuterComposite outerComposite) throws RestClientResponseException { - Object postBody = outerComposite; // create path and map variables final Map pathParams = new HashMap<>(); @@ -481,7 +478,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, outerComposite, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -531,7 +528,6 @@ public ResponseSpec fakeOuterCompositeSerializeWithResponseSpec(@jakarta.annotat * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation.Nullable BigDecimal body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -552,7 +548,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -602,7 +598,6 @@ public ResponseSpec fakeOuterNumberSerializeWithResponseSpec(@jakarta.annotation * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation.Nullable String body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -623,7 +618,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -673,7 +668,6 @@ public ResponseSpec fakeOuterStringSerializeWithResponseSpec(@jakarta.annotation * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.annotation.Nonnull OuterObjectWithEnumProperty outerObjectWithEnumProperty) throws RestClientResponseException { - Object postBody = outerObjectWithEnumProperty; // verify the required parameter 'outerObjectWithEnumProperty' is set if (outerObjectWithEnumProperty == null) { throw new RestClientResponseException("Missing the required parameter 'outerObjectWithEnumProperty' when calling fakePropertyEnumIntegerSerialize", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -698,7 +692,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, outerObjectWithEnumProperty, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -747,7 +741,6 @@ public ResponseSpec fakePropertyEnumIntegerSerializeWithResponseSpec(@jakarta.an * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws RestClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new RestClientResponseException("Missing the required parameter 'requestBody' when calling testAdditionalPropertiesReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -770,7 +763,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -817,7 +810,6 @@ public ResponseSpec testAdditionalPropertiesReferenceWithResponseSpec(@jakarta.a * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nullable File body) throws RestClientResponseException { - Object postBody = body; // verify the required parameter 'body' is set if (body == null) { throw new RestClientResponseException("Missing the required parameter 'body' when calling testBodyWithBinary", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -840,7 +832,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -887,7 +879,6 @@ public ResponseSpec testBodyWithBinaryWithResponseSpec(@jakarta.annotation.Nulla * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.Nonnull FileSchemaTestClass fileSchemaTestClass) throws RestClientResponseException { - Object postBody = fileSchemaTestClass; // verify the required parameter 'fileSchemaTestClass' is set if (fileSchemaTestClass == null) { throw new RestClientResponseException("Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -910,7 +901,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, fileSchemaTestClass, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1056,7 +1047,6 @@ public ResponseSpec testBodyWithQueryParamsWithResponseSpec(TestBodyWithQueryPar * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation.Nonnull String query, @jakarta.annotation.Nonnull User user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'query' is set if (query == null) { throw new RestClientResponseException("Missing the required parameter 'query' when calling testBodyWithQueryParams", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1085,7 +1075,7 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1136,7 +1126,6 @@ public ResponseSpec testBodyWithQueryParamsWithResponseSpec(@jakarta.annotation. * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull Client client) throws RestClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new RestClientResponseException("Missing the required parameter 'client' when calling testClientModel", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1161,7 +1150,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1469,7 +1458,6 @@ public ResponseSpec testEndpointParametersWithResponseSpec(TestEndpointParameter * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.Nonnull BigDecimal number, @jakarta.annotation.Nonnull Double _double, @jakarta.annotation.Nonnull String patternWithoutDelimiter, @jakarta.annotation.Nonnull byte[] _byte, @jakarta.annotation.Nullable Integer integer, @jakarta.annotation.Nullable Integer int32, @jakarta.annotation.Nullable Long int64, @jakarta.annotation.Nullable Float _float, @jakarta.annotation.Nullable String string, @jakarta.annotation.Nullable File binary, @jakarta.annotation.Nullable LocalDate date, @jakarta.annotation.Nullable OffsetDateTime dateTime, @jakarta.annotation.Nullable String password, @jakarta.annotation.Nullable String paramCallback) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'number' is set if (number == null) { throw new RestClientResponseException("Missing the required parameter 'number' when calling testEndpointParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1494,34 +1482,40 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (integer != null) + if (integer != null) { formParams.add("integer", integer); - if (int32 != null) + } + if (int32 != null) { formParams.add("int32", int32); - if (int64 != null) + } + if (int64 != null) { formParams.add("int64", int64); - if (number != null) - formParams.add("number", number); - if (_float != null) + } + formParams.add("number", number); + if (_float != null) { formParams.add("float", _float); - if (_double != null) - formParams.add("double", _double); - if (string != null) + } + formParams.add("double", _double); + if (string != null) { formParams.add("string", string); - if (patternWithoutDelimiter != null) - formParams.add("pattern_without_delimiter", patternWithoutDelimiter); - if (_byte != null) - formParams.add("byte", _byte); - if (binary != null) + } + formParams.add("pattern_without_delimiter", patternWithoutDelimiter); + formParams.add("byte", _byte); + if (binary != null) { formParams.add("binary", new FileSystemResource(binary)); - if (date != null) + } + if (date != null) { formParams.add("date", date); - if (dateTime != null) + } + if (dateTime != null) { formParams.add("dateTime", dateTime); - if (password != null) + } + if (password != null) { formParams.add("password", password); - if (paramCallback != null) + } + if (paramCallback != null) { formParams.add("callback", paramCallback); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1533,7 +1527,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { "http_basic_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1816,7 +1810,6 @@ public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -1831,14 +1824,19 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); - if (enumHeaderStringArray != null) - headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); - if (enumHeaderString != null) - headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); - if (enumFormStringArray != null) + if (enumHeaderStringArray != null) { + headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); + } + if (enumHeaderString != null) { + headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + } + + if (enumFormStringArray != null) { formParams.addAll("enum_form_string_array", enumFormStringArray); - if (enumFormString != null) + } + if (enumFormString != null) { formParams.add("enum_form_string", enumFormString); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1850,7 +1848,7 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2075,7 +2073,6 @@ public ResponseSpec testGroupParametersWithResponseSpec(TestGroupParametersReque * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonnull Integer requiredStringGroup, @jakarta.annotation.Nonnull Boolean requiredBooleanGroup, @jakarta.annotation.Nonnull Long requiredInt64Group, @jakarta.annotation.Nullable Integer stringGroup, @jakarta.annotation.Nullable Boolean booleanGroup, @jakarta.annotation.Nullable Long int64Group) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'requiredStringGroup' is set if (requiredStringGroup == null) { throw new RestClientResponseException("Missing the required parameter 'requiredStringGroup' when calling testGroupParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -2101,10 +2098,11 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); - if (requiredBooleanGroup != null) headerParams.add("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); - if (booleanGroup != null) - headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + if (booleanGroup != null) { + headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -2113,7 +2111,7 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2175,7 +2173,6 @@ public ResponseSpec testGroupParametersWithResponseSpec(@jakarta.annotation.Nonn * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws RestClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new RestClientResponseException("Missing the required parameter 'requestBody' when calling testInlineAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -2198,7 +2195,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2245,7 +2242,6 @@ public ResponseSpec testInlineAdditionalPropertiesWithResponseSpec(@jakarta.anno * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jakarta.annotation.Nonnull TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest) throws RestClientResponseException { - Object postBody = testInlineFreeformAdditionalPropertiesRequest; // verify the required parameter 'testInlineFreeformAdditionalPropertiesRequest' is set if (testInlineFreeformAdditionalPropertiesRequest == null) { throw new RestClientResponseException("Missing the required parameter 'testInlineFreeformAdditionalPropertiesRequest' when calling testInlineFreeformAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -2268,7 +2264,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, testInlineFreeformAdditionalPropertiesRequest, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2414,7 +2410,6 @@ public ResponseSpec testJsonFormDataWithResponseSpec(TestJsonFormDataRequest req * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String param, @jakarta.annotation.Nonnull String param2) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'param' is set if (param == null) { throw new RestClientResponseException("Missing the required parameter 'param' when calling testJsonFormData", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -2431,10 +2426,8 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (param != null) - formParams.add("param", param); - if (param2 != null) - formParams.add("param2", param2); + formParams.add("param", param); + formParams.add("param2", param2); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -2446,7 +2439,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2496,7 +2489,6 @@ public ResponseSpec testJsonFormDataWithResponseSpec(@jakarta.annotation.Nonnull * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull ChildWithNullable childWithNullable) throws RestClientResponseException { - Object postBody = childWithNullable; // verify the required parameter 'childWithNullable' is set if (childWithNullable == null) { throw new RestClientResponseException("Missing the required parameter 'childWithNullable' when calling testNullable", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -2519,7 +2511,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, childWithNullable, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2730,7 +2722,6 @@ public ResponseSpec testQueryParameterCollectionFormatWithResponseSpec(TestQuery * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta.annotation.Nonnull List pipe, @jakarta.annotation.Nonnull List ioutil, @jakarta.annotation.Nonnull List http, @jakarta.annotation.Nonnull List url, @jakarta.annotation.Nonnull List context, @jakarta.annotation.Nonnull String allowEmpty, @jakarta.annotation.Nullable Map language) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'pipe' is set if (pipe == null) { throw new RestClientResponseException("Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -2779,7 +2770,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2844,7 +2835,6 @@ public ResponseSpec testQueryParameterCollectionFormatWithResponseSpec(@jakarta. * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws RestClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new RestClientResponseException("Missing the required parameter 'requestBody' when calling testStringMapReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -2867,7 +2857,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 9e689558f312..180e13e69ef3 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Client client) throws RestClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new RestClientResponseException("Missing the required parameter 'client' when calling testClassname", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -78,7 +77,7 @@ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Cl String[] localVarAuthNames = new String[] { "api_key_query" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/PetApi.java index 047182c26ae8..f54f70d0f365 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/PetApi.java @@ -56,7 +56,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) throws RestClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new RestClientResponseException("Missing the required parameter 'pet' when calling addPet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -79,7 +78,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -232,7 +231,6 @@ public ResponseSpec deletePetWithResponseSpec(DeletePetRequest requestParameters * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String apiKey) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling deletePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -247,8 +245,10 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (apiKey != null) - headerParams.add("api_key", apiClient.parameterToString(apiKey)); + if (apiKey != null) { + headerParams.add("api_key", apiClient.parameterToString(apiKey)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -257,7 +257,7 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -312,7 +312,6 @@ public ResponseSpec deletePetWithResponseSpec(@jakarta.annotation.Nonnull Long p * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull List status) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'status' is set if (status == null) { throw new RestClientResponseException("Missing the required parameter 'status' when calling findPetsByStatus", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -337,7 +336,7 @@ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -391,7 +390,6 @@ public ResponseSpec findPetsByStatusWithResponseSpec(@jakarta.annotation.Nonnull * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull Set tags) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'tags' is set if (tags == null) { throw new RestClientResponseException("Missing the required parameter 'tags' when calling findPetsByTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -416,7 +414,7 @@ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull S String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -477,7 +475,6 @@ public ResponseSpec findPetsByTagsWithResponseSpec(@jakarta.annotation.Nonnull S * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long petId) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling getPetById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -502,7 +499,7 @@ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -560,7 +557,6 @@ public ResponseSpec getPetByIdWithResponseSpec(@jakarta.annotation.Nonnull Long * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pet) throws RestClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new RestClientResponseException("Missing the required parameter 'pet' when calling updatePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -583,7 +579,7 @@ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pe String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -755,7 +751,6 @@ public ResponseSpec updatePetWithFormWithResponseSpec(UpdatePetWithFormRequest r * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String name, @jakarta.annotation.Nullable String status) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling updatePetWithForm", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -770,10 +765,12 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (name != null) + if (name != null) { formParams.add("name", name); - if (status != null) + } + if (status != null) { formParams.add("status", status); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -785,7 +782,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -956,7 +953,6 @@ public ResponseSpec uploadFileWithResponseSpec(UploadFileRequest requestParamete * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String additionalMetadata, @jakarta.annotation.Nullable File _file) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling uploadFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -971,10 +967,12 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (_file != null) + } + if (_file != null) { formParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { "application/json" @@ -988,7 +986,7 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1158,7 +1156,6 @@ public ResponseSpec uploadFileWithRequiredFileWithResponseSpec(UploadFileWithReq * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nonnull File requiredFile, @jakarta.annotation.Nullable String additionalMetadata) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling uploadFileWithRequiredFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1177,10 +1174,10 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (requiredFile != null) - formParams.add("requiredFile", new FileSystemResource(requiredFile)); + } + formParams.add("requiredFile", new FileSystemResource(requiredFile)); final String[] localVarAccepts = { "application/json" @@ -1194,7 +1191,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/StoreApi.java index 3d92a323235a..47427feb6bbc 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/StoreApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull String orderId) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new RestClientResponseException("Missing the required parameter 'orderId' when calling deleteOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -76,7 +75,7 @@ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull Stri String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -126,7 +125,6 @@ public ResponseSpec deleteOrderWithResponseSpec(@jakarta.annotation.Nonnull Stri * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -145,7 +143,7 @@ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseExce String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -194,7 +192,6 @@ public ResponseSpec getInventoryWithResponseSpec() throws RestClientResponseExce * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Long orderId) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new RestClientResponseException("Missing the required parameter 'orderId' when calling getOrderById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -219,7 +216,7 @@ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Lon String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -276,7 +273,6 @@ public ResponseSpec getOrderByIdWithResponseSpec(@jakarta.annotation.Nonnull Lon * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order order) throws RestClientResponseException { - Object postBody = order; // verify the required parameter 'order' is set if (order == null) { throw new RestClientResponseException("Missing the required parameter 'order' when calling placeOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -301,7 +297,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, order, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/UserApi.java index 6762d084c3be..b20f5d090c64 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/UserApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new RestClientResponseException("Missing the required parameter 'user' when calling createUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -76,7 +75,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -123,7 +122,6 @@ public ResponseSpec createUserWithResponseSpec(@jakarta.annotation.Nonnull User * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotation.Nonnull List user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new RestClientResponseException("Missing the required parameter 'user' when calling createUsersWithArrayInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -146,7 +144,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -193,7 +191,6 @@ public ResponseSpec createUsersWithArrayInputWithResponseSpec(@jakarta.annotatio * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation.Nonnull List user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new RestClientResponseException("Missing the required parameter 'user' when calling createUsersWithListInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -216,7 +213,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -264,7 +261,6 @@ public ResponseSpec createUsersWithListInputWithResponseSpec(@jakarta.annotation * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull String username) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling deleteUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -287,7 +283,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -340,7 +336,6 @@ public ResponseSpec deleteUserWithResponseSpec(@jakarta.annotation.Nonnull Strin * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull String username) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling getUserByName", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -365,7 +360,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -526,7 +521,6 @@ public ResponseSpec loginUserWithResponseSpec(LoginUserRequest requestParameters * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull String password) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling loginUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -556,7 +550,7 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -610,7 +604,6 @@ public ResponseSpec loginUserWithResponseSpec(@jakarta.annotation.Nonnull String * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -627,7 +620,7 @@ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseExcept String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -774,7 +767,6 @@ public ResponseSpec updateUserWithResponseSpec(UpdateUserRequest requestParamete * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull User user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling updateUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -803,7 +795,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 11f7658880b6..afb639b82059 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.Nonnull Client client) throws RestClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new RestClientResponseException("Missing the required parameter 'client' when calling call123testSpecialTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -78,7 +77,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/DefaultApi.java index a6e59e8312a6..7a8afe2fc202 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -52,7 +52,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -71,7 +70,7 @@ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java index 2a394d658000..e6ab289ba5dc 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java @@ -66,7 +66,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -85,7 +84,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientRespons String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -131,7 +130,6 @@ public ResponseSpec fakeBigDecimalMapWithResponseSpec() throws RestClientRespons * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -150,7 +148,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseExc String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -234,7 +232,6 @@ public ResponseSpec fakeHttpSignatureTestWithResponseSpec(FakeHttpSignatureTestR * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.Nonnull Pet pet, @jakarta.annotation.Nullable String query1, @jakarta.annotation.Nullable String header1) throws RestClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new RestClientResponseException("Missing the required parameter 'pet' when calling fakeHttpSignatureTest", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -249,8 +246,10 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); - if (header1 != null) - headerParams.add("header_1", apiClient.parameterToString(header1)); + if (header1 != null) { + headerParams.add("header_1", apiClient.parameterToString(header1)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { @@ -261,7 +260,7 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No String[] localVarAuthNames = new String[] { "http_signature_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -315,7 +314,6 @@ public ResponseSpec fakeHttpSignatureTestWithResponseSpec(@jakarta.annotation.No * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotation.Nullable Boolean body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -336,7 +334,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -386,7 +384,6 @@ public ResponseSpec fakeOuterBooleanSerializeWithResponseSpec(@jakarta.annotatio * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotation.Nullable OuterComposite outerComposite) throws RestClientResponseException { - Object postBody = outerComposite; // create path and map variables final Map pathParams = new HashMap<>(); @@ -407,7 +404,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, outerComposite, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -457,7 +454,6 @@ public ResponseSpec fakeOuterCompositeSerializeWithResponseSpec(@jakarta.annotat * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation.Nullable BigDecimal body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -478,7 +474,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -528,7 +524,6 @@ public ResponseSpec fakeOuterNumberSerializeWithResponseSpec(@jakarta.annotation * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation.Nullable String body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -549,7 +544,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -599,7 +594,6 @@ public ResponseSpec fakeOuterStringSerializeWithResponseSpec(@jakarta.annotation * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.annotation.Nonnull OuterObjectWithEnumProperty outerObjectWithEnumProperty) throws RestClientResponseException { - Object postBody = outerObjectWithEnumProperty; // verify the required parameter 'outerObjectWithEnumProperty' is set if (outerObjectWithEnumProperty == null) { throw new RestClientResponseException("Missing the required parameter 'outerObjectWithEnumProperty' when calling fakePropertyEnumIntegerSerialize", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -624,7 +618,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, outerObjectWithEnumProperty, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -673,7 +667,6 @@ public ResponseSpec fakePropertyEnumIntegerSerializeWithResponseSpec(@jakarta.an * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws RestClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new RestClientResponseException("Missing the required parameter 'requestBody' when calling testAdditionalPropertiesReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -696,7 +689,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -743,7 +736,6 @@ public ResponseSpec testAdditionalPropertiesReferenceWithResponseSpec(@jakarta.a * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nullable File body) throws RestClientResponseException { - Object postBody = body; // verify the required parameter 'body' is set if (body == null) { throw new RestClientResponseException("Missing the required parameter 'body' when calling testBodyWithBinary", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -766,7 +758,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -813,7 +805,6 @@ public ResponseSpec testBodyWithBinaryWithResponseSpec(@jakarta.annotation.Nulla * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.Nonnull FileSchemaTestClass fileSchemaTestClass) throws RestClientResponseException { - Object postBody = fileSchemaTestClass; // verify the required parameter 'fileSchemaTestClass' is set if (fileSchemaTestClass == null) { throw new RestClientResponseException("Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -836,7 +827,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, fileSchemaTestClass, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -920,7 +911,6 @@ public ResponseSpec testBodyWithQueryParamsWithResponseSpec(TestBodyWithQueryPar * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation.Nonnull String query, @jakarta.annotation.Nonnull User user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'query' is set if (query == null) { throw new RestClientResponseException("Missing the required parameter 'query' when calling testBodyWithQueryParams", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -949,7 +939,7 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1000,7 +990,6 @@ public ResponseSpec testBodyWithQueryParamsWithResponseSpec(@jakarta.annotation. * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull Client client) throws RestClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new RestClientResponseException("Missing the required parameter 'client' when calling testClientModel", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1025,7 +1014,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1127,7 +1116,6 @@ public ResponseSpec testEndpointParametersWithResponseSpec(TestEndpointParameter * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.Nonnull BigDecimal number, @jakarta.annotation.Nonnull Double _double, @jakarta.annotation.Nonnull String patternWithoutDelimiter, @jakarta.annotation.Nonnull byte[] _byte, @jakarta.annotation.Nullable Integer integer, @jakarta.annotation.Nullable Integer int32, @jakarta.annotation.Nullable Long int64, @jakarta.annotation.Nullable Float _float, @jakarta.annotation.Nullable String string, @jakarta.annotation.Nullable File binary, @jakarta.annotation.Nullable LocalDate date, @jakarta.annotation.Nullable OffsetDateTime dateTime, @jakarta.annotation.Nullable String password, @jakarta.annotation.Nullable String paramCallback) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'number' is set if (number == null) { throw new RestClientResponseException("Missing the required parameter 'number' when calling testEndpointParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1152,34 +1140,40 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (integer != null) + if (integer != null) { formParams.add("integer", integer); - if (int32 != null) + } + if (int32 != null) { formParams.add("int32", int32); - if (int64 != null) + } + if (int64 != null) { formParams.add("int64", int64); - if (number != null) - formParams.add("number", number); - if (_float != null) + } + formParams.add("number", number); + if (_float != null) { formParams.add("float", _float); - if (_double != null) - formParams.add("double", _double); - if (string != null) + } + formParams.add("double", _double); + if (string != null) { formParams.add("string", string); - if (patternWithoutDelimiter != null) - formParams.add("pattern_without_delimiter", patternWithoutDelimiter); - if (_byte != null) - formParams.add("byte", _byte); - if (binary != null) + } + formParams.add("pattern_without_delimiter", patternWithoutDelimiter); + formParams.add("byte", _byte); + if (binary != null) { formParams.add("binary", new FileSystemResource(binary)); - if (date != null) + } + if (date != null) { formParams.add("date", date); - if (dateTime != null) + } + if (dateTime != null) { formParams.add("dateTime", dateTime); - if (password != null) + } + if (password != null) { formParams.add("password", password); - if (paramCallback != null) + } + if (paramCallback != null) { formParams.add("callback", paramCallback); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1191,7 +1185,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { "http_basic_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1328,7 +1322,6 @@ public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -1343,14 +1336,19 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); - if (enumHeaderStringArray != null) - headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); - if (enumHeaderString != null) - headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); - if (enumFormStringArray != null) + if (enumHeaderStringArray != null) { + headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); + } + if (enumHeaderString != null) { + headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + } + + if (enumFormStringArray != null) { formParams.addAll("enum_form_string_array", enumFormStringArray); - if (enumFormString != null) + } + if (enumFormString != null) { formParams.add("enum_form_string", enumFormString); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1362,7 +1360,7 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1477,7 +1475,6 @@ public ResponseSpec testGroupParametersWithResponseSpec(TestGroupParametersReque * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonnull Integer requiredStringGroup, @jakarta.annotation.Nonnull Boolean requiredBooleanGroup, @jakarta.annotation.Nonnull Long requiredInt64Group, @jakarta.annotation.Nullable Integer stringGroup, @jakarta.annotation.Nullable Boolean booleanGroup, @jakarta.annotation.Nullable Long int64Group) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'requiredStringGroup' is set if (requiredStringGroup == null) { throw new RestClientResponseException("Missing the required parameter 'requiredStringGroup' when calling testGroupParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1503,10 +1500,11 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); - if (requiredBooleanGroup != null) headerParams.add("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); - if (booleanGroup != null) - headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + if (booleanGroup != null) { + headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -1515,7 +1513,7 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1577,7 +1575,6 @@ public ResponseSpec testGroupParametersWithResponseSpec(@jakarta.annotation.Nonn * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws RestClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new RestClientResponseException("Missing the required parameter 'requestBody' when calling testInlineAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1600,7 +1597,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1647,7 +1644,6 @@ public ResponseSpec testInlineAdditionalPropertiesWithResponseSpec(@jakarta.anno * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jakarta.annotation.Nonnull TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest) throws RestClientResponseException { - Object postBody = testInlineFreeformAdditionalPropertiesRequest; // verify the required parameter 'testInlineFreeformAdditionalPropertiesRequest' is set if (testInlineFreeformAdditionalPropertiesRequest == null) { throw new RestClientResponseException("Missing the required parameter 'testInlineFreeformAdditionalPropertiesRequest' when calling testInlineFreeformAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1670,7 +1666,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, testInlineFreeformAdditionalPropertiesRequest, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1754,7 +1750,6 @@ public ResponseSpec testJsonFormDataWithResponseSpec(TestJsonFormDataRequest req * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String param, @jakarta.annotation.Nonnull String param2) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'param' is set if (param == null) { throw new RestClientResponseException("Missing the required parameter 'param' when calling testJsonFormData", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1771,10 +1766,8 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (param != null) - formParams.add("param", param); - if (param2 != null) - formParams.add("param2", param2); + formParams.add("param", param); + formParams.add("param2", param2); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1786,7 +1779,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1836,7 +1829,6 @@ public ResponseSpec testJsonFormDataWithResponseSpec(@jakarta.annotation.Nonnull * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull ChildWithNullable childWithNullable) throws RestClientResponseException { - Object postBody = childWithNullable; // verify the required parameter 'childWithNullable' is set if (childWithNullable == null) { throw new RestClientResponseException("Missing the required parameter 'childWithNullable' when calling testNullable", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1859,7 +1851,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, childWithNullable, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1948,7 +1940,6 @@ public ResponseSpec testQueryParameterCollectionFormatWithResponseSpec(TestQuery * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta.annotation.Nonnull List pipe, @jakarta.annotation.Nonnull List ioutil, @jakarta.annotation.Nonnull List http, @jakarta.annotation.Nonnull List url, @jakarta.annotation.Nonnull List context, @jakarta.annotation.Nonnull String allowEmpty, @jakarta.annotation.Nullable Map language) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'pipe' is set if (pipe == null) { throw new RestClientResponseException("Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1997,7 +1988,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2062,7 +2053,6 @@ public ResponseSpec testQueryParameterCollectionFormatWithResponseSpec(@jakarta. * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws RestClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new RestClientResponseException("Missing the required parameter 'requestBody' when calling testStringMapReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -2085,7 +2075,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 9e689558f312..180e13e69ef3 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Client client) throws RestClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new RestClientResponseException("Missing the required parameter 'client' when calling testClassname", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -78,7 +77,7 @@ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Cl String[] localVarAuthNames = new String[] { "api_key_query" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java index f6497584cec1..f2cb8b594c62 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java @@ -56,7 +56,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) throws RestClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new RestClientResponseException("Missing the required parameter 'pet' when calling addPet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -79,7 +78,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -170,7 +169,6 @@ public ResponseSpec deletePetWithResponseSpec(DeletePetRequest requestParameters * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String apiKey) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling deletePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -185,8 +183,10 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (apiKey != null) - headerParams.add("api_key", apiClient.parameterToString(apiKey)); + if (apiKey != null) { + headerParams.add("api_key", apiClient.parameterToString(apiKey)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -195,7 +195,7 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -250,7 +250,6 @@ public ResponseSpec deletePetWithResponseSpec(@jakarta.annotation.Nonnull Long p * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull List status) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'status' is set if (status == null) { throw new RestClientResponseException("Missing the required parameter 'status' when calling findPetsByStatus", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -275,7 +274,7 @@ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -329,7 +328,6 @@ public ResponseSpec findPetsByStatusWithResponseSpec(@jakarta.annotation.Nonnull * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull Set tags) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'tags' is set if (tags == null) { throw new RestClientResponseException("Missing the required parameter 'tags' when calling findPetsByTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -354,7 +352,7 @@ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull S String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -415,7 +413,6 @@ public ResponseSpec findPetsByTagsWithResponseSpec(@jakarta.annotation.Nonnull S * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long petId) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling getPetById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -440,7 +437,7 @@ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -498,7 +495,6 @@ public ResponseSpec getPetByIdWithResponseSpec(@jakarta.annotation.Nonnull Long * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pet) throws RestClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new RestClientResponseException("Missing the required parameter 'pet' when calling updatePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -521,7 +517,7 @@ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pe String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -619,7 +615,6 @@ public ResponseSpec updatePetWithFormWithResponseSpec(UpdatePetWithFormRequest r * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String name, @jakarta.annotation.Nullable String status) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling updatePetWithForm", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -634,10 +629,12 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (name != null) + if (name != null) { formParams.add("name", name); - if (status != null) + } + if (status != null) { formParams.add("status", status); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -649,7 +646,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -746,7 +743,6 @@ public ResponseSpec uploadFileWithResponseSpec(UploadFileRequest requestParamete * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String additionalMetadata, @jakarta.annotation.Nullable File _file) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling uploadFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -761,10 +757,12 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (_file != null) + } + if (_file != null) { formParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { "application/json" @@ -778,7 +776,7 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -874,7 +872,6 @@ public ResponseSpec uploadFileWithRequiredFileWithResponseSpec(UploadFileWithReq * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nonnull File requiredFile, @jakarta.annotation.Nullable String additionalMetadata) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling uploadFileWithRequiredFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -893,10 +890,10 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (requiredFile != null) - formParams.add("requiredFile", new FileSystemResource(requiredFile)); + } + formParams.add("requiredFile", new FileSystemResource(requiredFile)); final String[] localVarAccepts = { "application/json" @@ -910,7 +907,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java index 3d92a323235a..47427feb6bbc 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull String orderId) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new RestClientResponseException("Missing the required parameter 'orderId' when calling deleteOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -76,7 +75,7 @@ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull Stri String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -126,7 +125,6 @@ public ResponseSpec deleteOrderWithResponseSpec(@jakarta.annotation.Nonnull Stri * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -145,7 +143,7 @@ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseExce String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -194,7 +192,6 @@ public ResponseSpec getInventoryWithResponseSpec() throws RestClientResponseExce * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Long orderId) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new RestClientResponseException("Missing the required parameter 'orderId' when calling getOrderById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -219,7 +216,7 @@ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Lon String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -276,7 +273,6 @@ public ResponseSpec getOrderByIdWithResponseSpec(@jakarta.annotation.Nonnull Lon * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order order) throws RestClientResponseException { - Object postBody = order; // verify the required parameter 'order' is set if (order == null) { throw new RestClientResponseException("Missing the required parameter 'order' when calling placeOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -301,7 +297,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, order, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java index 37b35cb21788..3a61a93cc560 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new RestClientResponseException("Missing the required parameter 'user' when calling createUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -76,7 +75,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -123,7 +122,6 @@ public ResponseSpec createUserWithResponseSpec(@jakarta.annotation.Nonnull User * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotation.Nonnull List user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new RestClientResponseException("Missing the required parameter 'user' when calling createUsersWithArrayInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -146,7 +144,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -193,7 +191,6 @@ public ResponseSpec createUsersWithArrayInputWithResponseSpec(@jakarta.annotatio * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation.Nonnull List user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new RestClientResponseException("Missing the required parameter 'user' when calling createUsersWithListInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -216,7 +213,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -264,7 +261,6 @@ public ResponseSpec createUsersWithListInputWithResponseSpec(@jakarta.annotation * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull String username) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling deleteUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -287,7 +283,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -340,7 +336,6 @@ public ResponseSpec deleteUserWithResponseSpec(@jakarta.annotation.Nonnull Strin * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull String username) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling getUserByName", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -365,7 +360,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -464,7 +459,6 @@ public ResponseSpec loginUserWithResponseSpec(LoginUserRequest requestParameters * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull String password) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling loginUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -494,7 +488,7 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -548,7 +542,6 @@ public ResponseSpec loginUserWithResponseSpec(@jakarta.annotation.Nonnull String * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -565,7 +558,7 @@ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseExcept String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -650,7 +643,6 @@ public ResponseSpec updateUserWithResponseSpec(UpdateUserRequest requestParamete * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull User user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling updateUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -679,7 +671,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 11f7658880b6..afb639b82059 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.Nonnull Client client) throws RestClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new RestClientResponseException("Missing the required parameter 'client' when calling call123testSpecialTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -78,7 +77,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/DefaultApi.java index a6e59e8312a6..7a8afe2fc202 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -52,7 +52,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -71,7 +70,7 @@ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java index 04430f0b8fad..94d28674fdbc 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java @@ -66,7 +66,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -85,7 +84,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientRespons String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -131,7 +130,6 @@ public ResponseSpec fakeBigDecimalMapWithResponseSpec() throws RestClientRespons * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -150,7 +148,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseExc String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -198,7 +196,6 @@ public ResponseSpec fakeHealthGetWithResponseSpec() throws RestClientResponseExc * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.Nonnull Pet pet, @jakarta.annotation.Nullable String query1, @jakarta.annotation.Nullable String header1) throws RestClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new RestClientResponseException("Missing the required parameter 'pet' when calling fakeHttpSignatureTest", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -213,8 +210,10 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); - if (header1 != null) - headerParams.add("header_1", apiClient.parameterToString(header1)); + if (header1 != null) { + headerParams.add("header_1", apiClient.parameterToString(header1)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { @@ -225,7 +224,7 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No String[] localVarAuthNames = new String[] { "http_signature_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -279,7 +278,6 @@ public ResponseSpec fakeHttpSignatureTestWithResponseSpec(@jakarta.annotation.No * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotation.Nullable Boolean body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -300,7 +298,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -350,7 +348,6 @@ public ResponseSpec fakeOuterBooleanSerializeWithResponseSpec(@jakarta.annotatio * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotation.Nullable OuterComposite outerComposite) throws RestClientResponseException { - Object postBody = outerComposite; // create path and map variables final Map pathParams = new HashMap<>(); @@ -371,7 +368,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, outerComposite, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -421,7 +418,6 @@ public ResponseSpec fakeOuterCompositeSerializeWithResponseSpec(@jakarta.annotat * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation.Nullable BigDecimal body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -442,7 +438,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -492,7 +488,6 @@ public ResponseSpec fakeOuterNumberSerializeWithResponseSpec(@jakarta.annotation * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation.Nullable String body) throws RestClientResponseException { - Object postBody = body; // create path and map variables final Map pathParams = new HashMap<>(); @@ -513,7 +508,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -563,7 +558,6 @@ public ResponseSpec fakeOuterStringSerializeWithResponseSpec(@jakarta.annotation * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.annotation.Nonnull OuterObjectWithEnumProperty outerObjectWithEnumProperty) throws RestClientResponseException { - Object postBody = outerObjectWithEnumProperty; // verify the required parameter 'outerObjectWithEnumProperty' is set if (outerObjectWithEnumProperty == null) { throw new RestClientResponseException("Missing the required parameter 'outerObjectWithEnumProperty' when calling fakePropertyEnumIntegerSerialize", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -588,7 +582,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, outerObjectWithEnumProperty, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -637,7 +631,6 @@ public ResponseSpec fakePropertyEnumIntegerSerializeWithResponseSpec(@jakarta.an * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws RestClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new RestClientResponseException("Missing the required parameter 'requestBody' when calling testAdditionalPropertiesReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -660,7 +653,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -707,7 +700,6 @@ public ResponseSpec testAdditionalPropertiesReferenceWithResponseSpec(@jakarta.a * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nullable File body) throws RestClientResponseException { - Object postBody = body; // verify the required parameter 'body' is set if (body == null) { throw new RestClientResponseException("Missing the required parameter 'body' when calling testBodyWithBinary", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -730,7 +722,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -777,7 +769,6 @@ public ResponseSpec testBodyWithBinaryWithResponseSpec(@jakarta.annotation.Nulla * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.Nonnull FileSchemaTestClass fileSchemaTestClass) throws RestClientResponseException { - Object postBody = fileSchemaTestClass; // verify the required parameter 'fileSchemaTestClass' is set if (fileSchemaTestClass == null) { throw new RestClientResponseException("Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -800,7 +791,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, fileSchemaTestClass, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -848,7 +839,6 @@ public ResponseSpec testBodyWithFileSchemaWithResponseSpec(@jakarta.annotation.N * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation.Nonnull String query, @jakarta.annotation.Nonnull User user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'query' is set if (query == null) { throw new RestClientResponseException("Missing the required parameter 'query' when calling testBodyWithQueryParams", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -877,7 +867,7 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -928,7 +918,6 @@ public ResponseSpec testBodyWithQueryParamsWithResponseSpec(@jakarta.annotation. * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull Client client) throws RestClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new RestClientResponseException("Missing the required parameter 'client' when calling testClientModel", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -953,7 +942,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1016,7 +1005,6 @@ public ResponseSpec testClientModelWithResponseSpec(@jakarta.annotation.Nonnull * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.Nonnull BigDecimal number, @jakarta.annotation.Nonnull Double _double, @jakarta.annotation.Nonnull String patternWithoutDelimiter, @jakarta.annotation.Nonnull byte[] _byte, @jakarta.annotation.Nullable Integer integer, @jakarta.annotation.Nullable Integer int32, @jakarta.annotation.Nullable Long int64, @jakarta.annotation.Nullable Float _float, @jakarta.annotation.Nullable String string, @jakarta.annotation.Nullable File binary, @jakarta.annotation.Nullable LocalDate date, @jakarta.annotation.Nullable OffsetDateTime dateTime, @jakarta.annotation.Nullable String password, @jakarta.annotation.Nullable String paramCallback) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'number' is set if (number == null) { throw new RestClientResponseException("Missing the required parameter 'number' when calling testEndpointParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1041,34 +1029,40 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (integer != null) + if (integer != null) { formParams.add("integer", integer); - if (int32 != null) + } + if (int32 != null) { formParams.add("int32", int32); - if (int64 != null) + } + if (int64 != null) { formParams.add("int64", int64); - if (number != null) - formParams.add("number", number); - if (_float != null) + } + formParams.add("number", number); + if (_float != null) { formParams.add("float", _float); - if (_double != null) - formParams.add("double", _double); - if (string != null) + } + formParams.add("double", _double); + if (string != null) { formParams.add("string", string); - if (patternWithoutDelimiter != null) - formParams.add("pattern_without_delimiter", patternWithoutDelimiter); - if (_byte != null) - formParams.add("byte", _byte); - if (binary != null) + } + formParams.add("pattern_without_delimiter", patternWithoutDelimiter); + formParams.add("byte", _byte); + if (binary != null) { formParams.add("binary", new FileSystemResource(binary)); - if (date != null) + } + if (date != null) { formParams.add("date", date); - if (dateTime != null) + } + if (dateTime != null) { formParams.add("dateTime", dateTime); - if (password != null) + } + if (password != null) { formParams.add("password", password); - if (paramCallback != null) + } + if (paramCallback != null) { formParams.add("callback", paramCallback); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1080,7 +1074,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { "http_basic_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1178,7 +1172,6 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@jakarta.annotation.N * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -1193,14 +1186,19 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); - if (enumHeaderStringArray != null) - headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); - if (enumHeaderString != null) - headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); - if (enumFormStringArray != null) + if (enumHeaderStringArray != null) { + headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); + } + if (enumHeaderString != null) { + headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + } + + if (enumFormStringArray != null) { formParams.addAll("enum_form_string_array", enumFormStringArray); - if (enumFormString != null) + } + if (enumFormString != null) { formParams.add("enum_form_string", enumFormString); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1212,7 +1210,7 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1291,7 +1289,6 @@ public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nulla * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonnull Integer requiredStringGroup, @jakarta.annotation.Nonnull Boolean requiredBooleanGroup, @jakarta.annotation.Nonnull Long requiredInt64Group, @jakarta.annotation.Nullable Integer stringGroup, @jakarta.annotation.Nullable Boolean booleanGroup, @jakarta.annotation.Nullable Long int64Group) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'requiredStringGroup' is set if (requiredStringGroup == null) { throw new RestClientResponseException("Missing the required parameter 'requiredStringGroup' when calling testGroupParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1317,10 +1314,11 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); - if (requiredBooleanGroup != null) headerParams.add("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); - if (booleanGroup != null) - headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + if (booleanGroup != null) { + headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -1329,7 +1327,7 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1391,7 +1389,6 @@ public ResponseSpec testGroupParametersWithResponseSpec(@jakarta.annotation.Nonn * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws RestClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new RestClientResponseException("Missing the required parameter 'requestBody' when calling testInlineAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1414,7 +1411,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1461,7 +1458,6 @@ public ResponseSpec testInlineAdditionalPropertiesWithResponseSpec(@jakarta.anno * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jakarta.annotation.Nonnull TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest) throws RestClientResponseException { - Object postBody = testInlineFreeformAdditionalPropertiesRequest; // verify the required parameter 'testInlineFreeformAdditionalPropertiesRequest' is set if (testInlineFreeformAdditionalPropertiesRequest == null) { throw new RestClientResponseException("Missing the required parameter 'testInlineFreeformAdditionalPropertiesRequest' when calling testInlineFreeformAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1484,7 +1480,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, testInlineFreeformAdditionalPropertiesRequest, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1532,7 +1528,6 @@ public ResponseSpec testInlineFreeformAdditionalPropertiesWithResponseSpec(@jaka * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String param, @jakarta.annotation.Nonnull String param2) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'param' is set if (param == null) { throw new RestClientResponseException("Missing the required parameter 'param' when calling testJsonFormData", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1549,10 +1544,8 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (param != null) - formParams.add("param", param); - if (param2 != null) - formParams.add("param2", param2); + formParams.add("param", param); + formParams.add("param2", param2); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1564,7 +1557,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1614,7 +1607,6 @@ public ResponseSpec testJsonFormDataWithResponseSpec(@jakarta.annotation.Nonnull * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull ChildWithNullable childWithNullable) throws RestClientResponseException { - Object postBody = childWithNullable; // verify the required parameter 'childWithNullable' is set if (childWithNullable == null) { throw new RestClientResponseException("Missing the required parameter 'childWithNullable' when calling testNullable", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1637,7 +1629,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, childWithNullable, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1690,7 +1682,6 @@ public ResponseSpec testNullableWithResponseSpec(@jakarta.annotation.Nonnull Chi * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta.annotation.Nonnull List pipe, @jakarta.annotation.Nonnull List ioutil, @jakarta.annotation.Nonnull List http, @jakarta.annotation.Nonnull List url, @jakarta.annotation.Nonnull List context, @jakarta.annotation.Nonnull String allowEmpty, @jakarta.annotation.Nullable Map language) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'pipe' is set if (pipe == null) { throw new RestClientResponseException("Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1739,7 +1730,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1804,7 +1795,6 @@ public ResponseSpec testQueryParameterCollectionFormatWithResponseSpec(@jakarta. * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws RestClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new RestClientResponseException("Missing the required parameter 'requestBody' when calling testStringMapReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1827,7 +1817,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 9e689558f312..180e13e69ef3 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Client client) throws RestClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new RestClientResponseException("Missing the required parameter 'client' when calling testClassname", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -78,7 +77,7 @@ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Cl String[] localVarAuthNames = new String[] { "api_key_query" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/PetApi.java index 8241c901aea5..92f7c33ac6a4 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/PetApi.java @@ -56,7 +56,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) throws RestClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new RestClientResponseException("Missing the required parameter 'pet' when calling addPet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -79,7 +78,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -131,7 +130,6 @@ public ResponseSpec addPetWithResponseSpec(@jakarta.annotation.Nonnull Pet pet) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String apiKey) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling deletePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -146,8 +144,10 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (apiKey != null) - headerParams.add("api_key", apiClient.parameterToString(apiKey)); + if (apiKey != null) { + headerParams.add("api_key", apiClient.parameterToString(apiKey)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -156,7 +156,7 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -211,7 +211,6 @@ public ResponseSpec deletePetWithResponseSpec(@jakarta.annotation.Nonnull Long p * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull List status) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'status' is set if (status == null) { throw new RestClientResponseException("Missing the required parameter 'status' when calling findPetsByStatus", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -236,7 +235,7 @@ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -290,7 +289,6 @@ public ResponseSpec findPetsByStatusWithResponseSpec(@jakarta.annotation.Nonnull * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull Set tags) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'tags' is set if (tags == null) { throw new RestClientResponseException("Missing the required parameter 'tags' when calling findPetsByTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -315,7 +313,7 @@ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull S String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -376,7 +374,6 @@ public ResponseSpec findPetsByTagsWithResponseSpec(@jakarta.annotation.Nonnull S * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long petId) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling getPetById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -401,7 +398,7 @@ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -459,7 +456,6 @@ public ResponseSpec getPetByIdWithResponseSpec(@jakarta.annotation.Nonnull Long * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pet) throws RestClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new RestClientResponseException("Missing the required parameter 'pet' when calling updatePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -482,7 +478,7 @@ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pe String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -541,7 +537,6 @@ public ResponseSpec updatePetWithResponseSpec(@jakarta.annotation.Nonnull Pet pe * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String name, @jakarta.annotation.Nullable String status) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling updatePetWithForm", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -556,10 +551,12 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (name != null) + if (name != null) { formParams.add("name", name); - if (status != null) + } + if (status != null) { formParams.add("status", status); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -571,7 +568,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -630,7 +627,6 @@ public ResponseSpec updatePetWithFormWithResponseSpec(@jakarta.annotation.Nonnul * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String additionalMetadata, @jakarta.annotation.Nullable File _file) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling uploadFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -645,10 +641,12 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (_file != null) + } + if (_file != null) { formParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { "application/json" @@ -662,7 +660,7 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -720,7 +718,6 @@ public ResponseSpec uploadFileWithResponseSpec(@jakarta.annotation.Nonnull Long * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nonnull File requiredFile, @jakarta.annotation.Nullable String additionalMetadata) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new RestClientResponseException("Missing the required parameter 'petId' when calling uploadFileWithRequiredFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -739,10 +736,10 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (requiredFile != null) - formParams.add("requiredFile", new FileSystemResource(requiredFile)); + } + formParams.add("requiredFile", new FileSystemResource(requiredFile)); final String[] localVarAccepts = { "application/json" @@ -756,7 +753,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/StoreApi.java index 3d92a323235a..47427feb6bbc 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/StoreApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull String orderId) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new RestClientResponseException("Missing the required parameter 'orderId' when calling deleteOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -76,7 +75,7 @@ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull Stri String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -126,7 +125,6 @@ public ResponseSpec deleteOrderWithResponseSpec(@jakarta.annotation.Nonnull Stri * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -145,7 +143,7 @@ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseExce String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -194,7 +192,6 @@ public ResponseSpec getInventoryWithResponseSpec() throws RestClientResponseExce * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Long orderId) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new RestClientResponseException("Missing the required parameter 'orderId' when calling getOrderById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -219,7 +216,7 @@ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Lon String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -276,7 +273,6 @@ public ResponseSpec getOrderByIdWithResponseSpec(@jakarta.annotation.Nonnull Lon * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order order) throws RestClientResponseException { - Object postBody = order; // verify the required parameter 'order' is set if (order == null) { throw new RestClientResponseException("Missing the required parameter 'order' when calling placeOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -301,7 +297,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, order, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/UserApi.java index 4ea56b7257bd..f9d2cd8e80a3 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/UserApi.java @@ -53,7 +53,6 @@ public void setApiClient(ApiClient apiClient) { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new RestClientResponseException("Missing the required parameter 'user' when calling createUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -76,7 +75,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -123,7 +122,6 @@ public ResponseSpec createUserWithResponseSpec(@jakarta.annotation.Nonnull User * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotation.Nonnull List user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new RestClientResponseException("Missing the required parameter 'user' when calling createUsersWithArrayInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -146,7 +144,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -193,7 +191,6 @@ public ResponseSpec createUsersWithArrayInputWithResponseSpec(@jakarta.annotatio * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation.Nonnull List user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new RestClientResponseException("Missing the required parameter 'user' when calling createUsersWithListInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -216,7 +213,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -264,7 +261,6 @@ public ResponseSpec createUsersWithListInputWithResponseSpec(@jakarta.annotation * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull String username) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling deleteUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -287,7 +283,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -340,7 +336,6 @@ public ResponseSpec deleteUserWithResponseSpec(@jakarta.annotation.Nonnull Strin * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull String username) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling getUserByName", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -365,7 +360,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -423,7 +418,6 @@ public ResponseSpec getUserByNameWithResponseSpec(@jakarta.annotation.Nonnull St * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull String password) throws RestClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling loginUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -453,7 +447,7 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -507,7 +501,6 @@ public ResponseSpec loginUserWithResponseSpec(@jakarta.annotation.Nonnull String * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseException { - Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -524,7 +517,7 @@ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseExcept String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -570,7 +563,6 @@ public ResponseSpec logoutUserWithResponseSpec() throws RestClientResponseExcept * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull User user) throws RestClientResponseException { - Object postBody = user; // verify the required parameter 'username' is set if (username == null) { throw new RestClientResponseException("Missing the required parameter 'username' when calling updateUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -599,7 +591,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/resttemplate-jakarta/pom.xml b/samples/client/petstore/java/resttemplate-jakarta/pom.xml index ce84bb940c43..6ada5a1a20b9 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/pom.xml +++ b/samples/client/petstore/java/resttemplate-jakarta/pom.xml @@ -147,7 +147,6 @@ 17 17 - diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/PetApi.java index 81b9e3e41b06..1908bcf24fe1 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/PetApi.java @@ -60,7 +60,6 @@ public Pet addPet(@jakarta.annotation.Nonnull Pet pet) throws RestClientExceptio * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pet) throws RestClientException { - Object localVarPostBody = pet; // verify the required parameter 'pet' is set if (pet == null) { @@ -68,10 +67,10 @@ public ResponseEntity addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pe } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -84,8 +83,8 @@ public ResponseEntity addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pe String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Deletes a pet @@ -109,7 +108,6 @@ public void deletePet(@jakarta.annotation.Nonnull Long petId, @jakarta.annotatio * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deletePetWithHttpInfo(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String apiKey) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -117,16 +115,17 @@ public ResponseEntity deletePetWithHttpInfo(@jakarta.annotation.Nonnull Lo } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (apiKey != null) - localVarHeaderParams.add("api_key", apiClient.parameterToString(apiKey)); + if (apiKey != null) { + localVarHeaderParams.add("api_key", apiClient.parameterToString(apiKey)); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -135,8 +134,8 @@ public ResponseEntity deletePetWithHttpInfo(@jakarta.annotation.Nonnull Lo String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Finds Pets by status @@ -161,7 +160,6 @@ public List findPetsByStatus(@jakarta.annotation.Nonnull List statu * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity> findPetsByStatusWithHttpInfo(@jakarta.annotation.Nonnull List status) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'status' is set if (status == null) { @@ -169,10 +167,10 @@ public ResponseEntity> findPetsByStatusWithHttpInfo(@jakarta.annotatio } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); @@ -186,8 +184,8 @@ public ResponseEntity> findPetsByStatusWithHttpInfo(@jakarta.annotatio String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Finds Pets by tags @@ -216,7 +214,6 @@ public List findPetsByTags(@jakarta.annotation.Nonnull List tags) t */ @Deprecated public ResponseEntity> findPetsByTagsWithHttpInfo(@jakarta.annotation.Nonnull List tags) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'tags' is set if (tags == null) { @@ -224,10 +221,10 @@ public ResponseEntity> findPetsByTagsWithHttpInfo(@jakarta.annotation. } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); @@ -241,8 +238,8 @@ public ResponseEntity> findPetsByTagsWithHttpInfo(@jakarta.annotation. String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Find pet by ID @@ -269,7 +266,6 @@ public Pet getPetById(@jakarta.annotation.Nonnull Long petId) throws RestClientE * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getPetByIdWithHttpInfo(@jakarta.annotation.Nonnull Long petId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -277,13 +273,13 @@ public ResponseEntity getPetByIdWithHttpInfo(@jakarta.annotation.Nonnull Lo } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -294,8 +290,8 @@ public ResponseEntity getPetByIdWithHttpInfo(@jakarta.annotation.Nonnull Lo String[] localVarAuthNames = new String[] { "api_key" }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Update an existing pet @@ -328,7 +324,6 @@ public Pet updatePet(@jakarta.annotation.Nonnull Pet pet) throws RestClientExcep * @see Update an existing pet Documentation */ public ResponseEntity updatePetWithHttpInfo(@jakarta.annotation.Nonnull Pet pet) throws RestClientException { - Object localVarPostBody = pet; // verify the required parameter 'pet' is set if (pet == null) { @@ -336,10 +331,10 @@ public ResponseEntity updatePetWithHttpInfo(@jakarta.annotation.Nonnull Pet } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -352,8 +347,8 @@ public ResponseEntity updatePetWithHttpInfo(@jakarta.annotation.Nonnull Pet String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Updates a pet in the store with form data @@ -379,7 +374,6 @@ public void updatePetWithForm(@jakarta.annotation.Nonnull Long petId, @jakarta.a * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity updatePetWithFormWithHttpInfo(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String name, @jakarta.annotation.Nullable String status) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -387,18 +381,20 @@ public ResponseEntity updatePetWithFormWithHttpInfo(@jakarta.annotation.No } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (name != null) + if (name != null) { localVarFormParams.add("name", name); - if (status != null) + } + if (status != null) { localVarFormParams.add("status", status); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -409,8 +405,8 @@ public ResponseEntity updatePetWithFormWithHttpInfo(@jakarta.annotation.No String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * uploads an image @@ -437,7 +433,6 @@ public ModelApiResponse uploadFile(@jakarta.annotation.Nonnull Long petId, @jaka * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity uploadFileWithHttpInfo(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String additionalMetadata, @jakarta.annotation.Nullable File _file) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -445,18 +440,20 @@ public ResponseEntity uploadFileWithHttpInfo(@jakarta.annotati } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { localVarFormParams.add("additionalMetadata", additionalMetadata); - if (_file != null) + } + if (_file != null) { localVarFormParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { "application/json" @@ -469,20 +466,19 @@ public ResponseEntity uploadFileWithHttpInfo(@jakarta.annotati String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -495,6 +491,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { "petstore_auth" }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java index 09749ef4f043..d4500779270d 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java @@ -57,7 +57,6 @@ public void deleteOrder(@jakarta.annotation.Nonnull String orderId) throws RestC * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deleteOrderWithHttpInfo(@jakarta.annotation.Nonnull String orderId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { @@ -65,13 +64,13 @@ public ResponseEntity deleteOrderWithHttpInfo(@jakarta.annotation.Nonnull } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("orderId", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -80,8 +79,8 @@ public ResponseEntity deleteOrderWithHttpInfo(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{orderId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/store/order/{orderId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Returns pet inventories by status @@ -102,13 +101,12 @@ public Map getInventory() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity> getInventoryWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -119,8 +117,8 @@ public ResponseEntity> getInventoryWithHttpInfo() throws Re String[] localVarAuthNames = new String[] { "api_key" }; - ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Find purchase order by ID @@ -147,7 +145,6 @@ public Order getOrderById(@jakarta.annotation.Nonnull Long orderId) throws RestC * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getOrderByIdWithHttpInfo(@jakarta.annotation.Nonnull Long orderId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { @@ -155,13 +152,13 @@ public ResponseEntity getOrderByIdWithHttpInfo(@jakarta.annotation.Nonnul } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("orderId", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -172,8 +169,8 @@ public ResponseEntity getOrderByIdWithHttpInfo(@jakarta.annotation.Nonnul String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{orderId}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/store/order/{orderId}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Place an order for a pet @@ -198,7 +195,6 @@ public Order placeOrder(@jakarta.annotation.Nonnull Order order) throws RestClie * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity placeOrderWithHttpInfo(@jakarta.annotation.Nonnull Order order) throws RestClientException { - Object localVarPostBody = order; // verify the required parameter 'order' is set if (order == null) { @@ -206,10 +202,10 @@ public ResponseEntity placeOrderWithHttpInfo(@jakarta.annotation.Nonnull } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -222,20 +218,19 @@ public ResponseEntity placeOrderWithHttpInfo(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/store/order", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, order, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -248,6 +243,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/UserApi.java index 98f15be45f4d..df4fe52f026c 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/api/UserApi.java @@ -56,7 +56,6 @@ public void createUser(@jakarta.annotation.Nonnull User user) throws RestClientE * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUserWithHttpInfo(@jakarta.annotation.Nonnull User user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -64,10 +63,10 @@ public ResponseEntity createUserWithHttpInfo(@jakarta.annotation.Nonnull U } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -78,8 +77,8 @@ public ResponseEntity createUserWithHttpInfo(@jakarta.annotation.Nonnull U String[] localVarAuthNames = new String[] { "api_key" }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Creates list of users with given input array @@ -101,7 +100,6 @@ public void createUsersWithArrayInput(@jakarta.annotation.Nonnull List use * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@jakarta.annotation.Nonnull List user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -109,10 +107,10 @@ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@jakarta.annot } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -123,8 +121,8 @@ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@jakarta.annot String[] localVarAuthNames = new String[] { "api_key" }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Creates list of users with given input array @@ -146,7 +144,6 @@ public void createUsersWithListInput(@jakarta.annotation.Nonnull List user * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUsersWithListInputWithHttpInfo(@jakarta.annotation.Nonnull List user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -154,10 +151,10 @@ public ResponseEntity createUsersWithListInputWithHttpInfo(@jakarta.annota } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -168,8 +165,8 @@ public ResponseEntity createUsersWithListInputWithHttpInfo(@jakarta.annota String[] localVarAuthNames = new String[] { "api_key" }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Delete user @@ -193,7 +190,6 @@ public void deleteUser(@jakarta.annotation.Nonnull String username) throws RestC * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deleteUserWithHttpInfo(@jakarta.annotation.Nonnull String username) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -201,13 +197,13 @@ public ResponseEntity deleteUserWithHttpInfo(@jakarta.annotation.Nonnull S } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -216,8 +212,8 @@ public ResponseEntity deleteUserWithHttpInfo(@jakarta.annotation.Nonnull S String[] localVarAuthNames = new String[] { "api_key" }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Get user by user name @@ -244,7 +240,6 @@ public User getUserByName(@jakarta.annotation.Nonnull String username) throws Re * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getUserByNameWithHttpInfo(@jakarta.annotation.Nonnull String username) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -252,13 +247,13 @@ public ResponseEntity getUserByNameWithHttpInfo(@jakarta.annotation.Nonnul } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -269,8 +264,8 @@ public ResponseEntity getUserByNameWithHttpInfo(@jakarta.annotation.Nonnul String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Logs user into the system @@ -297,7 +292,6 @@ public String loginUser(@jakarta.annotation.Nonnull String username, @jakarta.an * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity loginUserWithHttpInfo(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull String password) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -310,10 +304,10 @@ public ResponseEntity loginUserWithHttpInfo(@jakarta.annotation.Nonnull } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); @@ -328,8 +322,8 @@ public ResponseEntity loginUserWithHttpInfo(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user/login", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Logs out current logged in user session @@ -349,13 +343,12 @@ public void logoutUser() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity logoutUserWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -364,8 +357,8 @@ public ResponseEntity logoutUserWithHttpInfo() throws RestClientException String[] localVarAuthNames = new String[] { "api_key" }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Updated user @@ -391,7 +384,6 @@ public void updateUser(@jakarta.annotation.Nonnull String username, @jakarta.ann * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity updateUserWithHttpInfo(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull User user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'username' is set if (username == null) { @@ -404,13 +396,13 @@ public ResponseEntity updateUserWithHttpInfo(@jakarta.annotation.Nonnull S } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -421,20 +413,19 @@ public ResponseEntity updateUserWithHttpInfo(@jakarta.annotation.Nonnull S String[] localVarAuthNames = new String[] { "api_key" }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, uriVariables, localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -445,6 +436,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { "api_key" }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson2/pom.xml b/samples/client/petstore/java/resttemplate-springBoot4-jackson2/pom.xml index f3e42b760fb3..760ac1d4f955 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson2/pom.xml +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson2/pom.xml @@ -147,9 +147,6 @@ 17 17 - 17 - 17 - diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-springBoot4-jackson2/src/main/java/org/openapitools/client/api/PetApi.java index d40134f571c3..65bdf683a9ce 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson2/src/main/java/org/openapitools/client/api/PetApi.java @@ -58,7 +58,6 @@ public Pet addPet(@jakarta.annotation.Nonnull Pet pet) throws RestClientExceptio * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pet) throws RestClientException { - Object localVarPostBody = pet; // verify the required parameter 'pet' is set if (pet == null) { @@ -66,10 +65,10 @@ public ResponseEntity addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pe } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -82,20 +81,19 @@ public ResponseEntity addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pe String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -108,6 +106,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { "petstore_auth" }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/pom.xml b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/pom.xml index 6d017761265c..211715da404a 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/pom.xml +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/pom.xml @@ -147,9 +147,6 @@ 17 17 - 17 - 17 - diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FileApi.java b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FileApi.java index e234b5dcef86..79883025fe93 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FileApi.java +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FileApi.java @@ -56,7 +56,6 @@ public FileContent fileIdGet(String id) throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fileIdGetWithHttpInfo(String id) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'id' is set if (id == null) { @@ -64,13 +63,13 @@ public ResponseEntity fileIdGetWithHttpInfo(String id) throws RestC } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("id", id); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -81,20 +80,19 @@ public ResponseEntity fileIdGetWithHttpInfo(String id) throws RestC String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/file/{id}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/file/{id}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -105,6 +103,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FooApi.java b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FooApi.java index be1a1f55a226..7208203340b8 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FooApi.java +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FooApi.java @@ -64,23 +64,23 @@ public Foo fooDtParamGet(java.time.@Nullable Instant dtParam, java.time.@Nullabl * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fooDtParamGetWithHttpInfo(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws RestClientException { - Object localVarPostBody = null; // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("dtParam", dtParam); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "dtQuery", dtQuery)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "color", color)); - if (dtCookie != null) - localVarCookieParams.add("dtCookie", apiClient.parameterToString(dtCookie)); + if (dtCookie != null) { + localVarCookieParams.add("dtCookie", apiClient.parameterToString(dtCookie)); + } final String[] localVarAccepts = { "application/json" @@ -91,20 +91,19 @@ public ResponseEntity fooDtParamGetWithHttpInfo(java.time.@Nullable Instant String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo/{dtParam}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/foo/{dtParam}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -115,6 +114,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java index 42f5a01e0221..339bf3ac8fb6 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java @@ -56,7 +56,6 @@ public RequiredAndNullable requiredAndNullablePost(RequiredAndNullable requiredA * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity requiredAndNullablePostWithHttpInfo(RequiredAndNullable requiredAndNullable) throws RestClientException { - Object localVarPostBody = requiredAndNullable; // verify the required parameter 'requiredAndNullable' is set if (requiredAndNullable == null) { @@ -64,10 +63,10 @@ public ResponseEntity requiredAndNullablePostWithHttpInfo(R } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -80,20 +79,19 @@ public ResponseEntity requiredAndNullablePostWithHttpInfo(R String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/requiredAndNullable", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/requiredAndNullable", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, requiredAndNullable, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -106,6 +104,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/UploadApi.java b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/UploadApi.java index 4f3a4c879f4c..eed5dcb90457 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/UploadApi.java +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/UploadApi.java @@ -56,16 +56,16 @@ public void uploadFilesPost(@Nullable List _file) throws RestClientExcepti * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity uploadFilesPostWithHttpInfo(@Nullable List _file) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (_file != null) + if (_file != null) { localVarFormParams.addAll("file", _file.stream().map(FileSystemResource::new).collect(Collectors.toList())); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -76,8 +76,8 @@ public ResponseEntity uploadFilesPostWithHttpInfo(@Nullable List _fi String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/uploadFiles", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/uploadFiles", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -99,16 +99,16 @@ public void uploadPost(@Nullable File _file) throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity uploadPostWithHttpInfo(@Nullable File _file) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (_file != null) + if (_file != null) { localVarFormParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -119,20 +119,19 @@ public ResponseEntity uploadPostWithHttpInfo(@Nullable File _file) throws String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/upload", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/upload", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -143,6 +142,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3/pom.xml b/samples/client/petstore/java/resttemplate-springBoot4-jackson3/pom.xml index b84c52c5818b..f1dee7958e75 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3/pom.xml +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3/pom.xml @@ -147,9 +147,6 @@ 17 17 - 17 - 17 - diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-springBoot4-jackson3/src/main/java/org/openapitools/client/api/PetApi.java index d40134f571c3..65bdf683a9ce 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3/src/main/java/org/openapitools/client/api/PetApi.java @@ -58,7 +58,6 @@ public Pet addPet(@jakarta.annotation.Nonnull Pet pet) throws RestClientExceptio * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pet) throws RestClientException { - Object localVarPostBody = pet; // verify the required parameter 'pet' is set if (pet == null) { @@ -66,10 +65,10 @@ public ResponseEntity addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pe } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -82,20 +81,19 @@ public ResponseEntity addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pe String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + ParameterizedTypeReference localReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -108,6 +106,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { "petstore_auth" }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-swagger1/pom.xml b/samples/client/petstore/java/resttemplate-swagger1/pom.xml index 43b42e1f0b46..5c8e401c779e 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/pom.xml +++ b/samples/client/petstore/java/resttemplate-swagger1/pom.xml @@ -145,10 +145,8 @@ maven-compiler-plugin 3.11.0 - 1.8 1.8 - diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/PetApi.java index 6dc7093d053c..706c80f1c5b1 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/PetApi.java @@ -60,7 +60,6 @@ public Pet addPet(@javax.annotation.Nonnull Pet pet) throws RestClientException * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet) throws RestClientException { - Object localVarPostBody = pet; // verify the required parameter 'pet' is set if (pet == null) { @@ -68,10 +67,10 @@ public ResponseEntity addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet) } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -85,7 +84,7 @@ public ResponseEntity addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet) String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Deletes a pet @@ -109,7 +108,6 @@ public void deletePet(@javax.annotation.Nonnull Long petId, @javax.annotation.Nu * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deletePetWithHttpInfo(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String apiKey) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -117,16 +115,17 @@ public ResponseEntity deletePetWithHttpInfo(@javax.annotation.Nonnull Long } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (apiKey != null) - localVarHeaderParams.add("api_key", apiClient.parameterToString(apiKey)); + if (apiKey != null) { + localVarHeaderParams.add("api_key", apiClient.parameterToString(apiKey)); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -136,7 +135,7 @@ public ResponseEntity deletePetWithHttpInfo(@javax.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Finds Pets by status @@ -161,7 +160,6 @@ public List findPetsByStatus(@javax.annotation.Nonnull List status) * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity> findPetsByStatusWithHttpInfo(@javax.annotation.Nonnull List status) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'status' is set if (status == null) { @@ -169,10 +167,10 @@ public ResponseEntity> findPetsByStatusWithHttpInfo(@javax.annotation. } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); @@ -187,7 +185,7 @@ public ResponseEntity> findPetsByStatusWithHttpInfo(@javax.annotation. String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Finds Pets by tags @@ -216,7 +214,6 @@ public List findPetsByTags(@javax.annotation.Nonnull List tags) thr */ @Deprecated public ResponseEntity> findPetsByTagsWithHttpInfo(@javax.annotation.Nonnull List tags) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'tags' is set if (tags == null) { @@ -224,10 +221,10 @@ public ResponseEntity> findPetsByTagsWithHttpInfo(@javax.annotation.No } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); @@ -242,7 +239,7 @@ public ResponseEntity> findPetsByTagsWithHttpInfo(@javax.annotation.No String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Find pet by ID @@ -269,7 +266,6 @@ public Pet getPetById(@javax.annotation.Nonnull Long petId) throws RestClientExc * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long petId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -277,13 +273,13 @@ public ResponseEntity getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -295,7 +291,7 @@ public ResponseEntity getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Update an existing pet @@ -328,7 +324,6 @@ public Pet updatePet(@javax.annotation.Nonnull Pet pet) throws RestClientExcepti * @see Update an existing pet Documentation */ public ResponseEntity updatePetWithHttpInfo(@javax.annotation.Nonnull Pet pet) throws RestClientException { - Object localVarPostBody = pet; // verify the required parameter 'pet' is set if (pet == null) { @@ -336,10 +331,10 @@ public ResponseEntity updatePetWithHttpInfo(@javax.annotation.Nonnull Pet p } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -353,7 +348,7 @@ public ResponseEntity updatePetWithHttpInfo(@javax.annotation.Nonnull Pet p String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Updates a pet in the store with form data @@ -379,7 +374,6 @@ public void updatePetWithForm(@javax.annotation.Nonnull Long petId, @javax.annot * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity updatePetWithFormWithHttpInfo(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String name, @javax.annotation.Nullable String status) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -387,18 +381,20 @@ public ResponseEntity updatePetWithFormWithHttpInfo(@javax.annotation.Nonn } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (name != null) + if (name != null) { localVarFormParams.add("name", name); - if (status != null) + } + if (status != null) { localVarFormParams.add("status", status); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -410,7 +406,7 @@ public ResponseEntity updatePetWithFormWithHttpInfo(@javax.annotation.Nonn String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * uploads an image @@ -437,7 +433,6 @@ public ModelApiResponse uploadFile(@javax.annotation.Nonnull Long petId, @javax. * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity uploadFileWithHttpInfo(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String additionalMetadata, @javax.annotation.Nullable File _file) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -445,18 +440,20 @@ public ResponseEntity uploadFileWithHttpInfo(@javax.annotation } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { localVarFormParams.add("additionalMetadata", additionalMetadata); - if (_file != null) + } + if (_file != null) { localVarFormParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { "application/json" @@ -470,19 +467,18 @@ public ResponseEntity uploadFileWithHttpInfo(@javax.annotation String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -495,6 +491,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { "petstore_auth" }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java index 22cfbd8311bc..5d8aba78c26d 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/StoreApi.java @@ -57,7 +57,6 @@ public void deleteOrder(@javax.annotation.Nonnull String orderId) throws RestCli * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deleteOrderWithHttpInfo(@javax.annotation.Nonnull String orderId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { @@ -65,13 +64,13 @@ public ResponseEntity deleteOrderWithHttpInfo(@javax.annotation.Nonnull St } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("orderId", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -81,7 +80,7 @@ public ResponseEntity deleteOrderWithHttpInfo(@javax.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{orderId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/order/{orderId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Returns pet inventories by status @@ -102,13 +101,12 @@ public Map getInventory() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity> getInventoryWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -120,7 +118,7 @@ public ResponseEntity> getInventoryWithHttpInfo() throws Re String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Find purchase order by ID @@ -147,7 +145,6 @@ public Order getOrderById(@javax.annotation.Nonnull Long orderId) throws RestCli * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getOrderByIdWithHttpInfo(@javax.annotation.Nonnull Long orderId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { @@ -155,13 +152,13 @@ public ResponseEntity getOrderByIdWithHttpInfo(@javax.annotation.Nonnull } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("orderId", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -173,7 +170,7 @@ public ResponseEntity getOrderByIdWithHttpInfo(@javax.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{orderId}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/order/{orderId}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Place an order for a pet @@ -198,7 +195,6 @@ public Order placeOrder(@javax.annotation.Nonnull Order order) throws RestClient * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity placeOrderWithHttpInfo(@javax.annotation.Nonnull Order order) throws RestClientException { - Object localVarPostBody = order; // verify the required parameter 'order' is set if (order == null) { @@ -206,10 +202,10 @@ public ResponseEntity placeOrderWithHttpInfo(@javax.annotation.Nonnull Or } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -223,19 +219,18 @@ public ResponseEntity placeOrderWithHttpInfo(@javax.annotation.Nonnull Or String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, order, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -248,6 +243,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/UserApi.java index ada00fe4fc7d..14a1daa5c286 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/api/UserApi.java @@ -56,7 +56,6 @@ public void createUser(@javax.annotation.Nonnull User user) throws RestClientExc * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUserWithHttpInfo(@javax.annotation.Nonnull User user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -64,10 +63,10 @@ public ResponseEntity createUserWithHttpInfo(@javax.annotation.Nonnull Use } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -79,7 +78,7 @@ public ResponseEntity createUserWithHttpInfo(@javax.annotation.Nonnull Use String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Creates list of users with given input array @@ -101,7 +100,6 @@ public void createUsersWithArrayInput(@javax.annotation.Nonnull List user) * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@javax.annotation.Nonnull List user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -109,10 +107,10 @@ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@javax.annotat } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -124,7 +122,7 @@ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@javax.annotat String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Creates list of users with given input array @@ -146,7 +144,6 @@ public void createUsersWithListInput(@javax.annotation.Nonnull List user) * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUsersWithListInputWithHttpInfo(@javax.annotation.Nonnull List user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -154,10 +151,10 @@ public ResponseEntity createUsersWithListInputWithHttpInfo(@javax.annotati } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -169,7 +166,7 @@ public ResponseEntity createUsersWithListInputWithHttpInfo(@javax.annotati String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Delete user @@ -193,7 +190,6 @@ public void deleteUser(@javax.annotation.Nonnull String username) throws RestCli * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deleteUserWithHttpInfo(@javax.annotation.Nonnull String username) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -201,13 +197,13 @@ public ResponseEntity deleteUserWithHttpInfo(@javax.annotation.Nonnull Str } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -217,7 +213,7 @@ public ResponseEntity deleteUserWithHttpInfo(@javax.annotation.Nonnull Str String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Get user by user name @@ -244,7 +240,6 @@ public User getUserByName(@javax.annotation.Nonnull String username) throws Rest * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getUserByNameWithHttpInfo(@javax.annotation.Nonnull String username) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -252,13 +247,13 @@ public ResponseEntity getUserByNameWithHttpInfo(@javax.annotation.Nonnull } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -270,7 +265,7 @@ public ResponseEntity getUserByNameWithHttpInfo(@javax.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Logs user into the system @@ -297,7 +292,6 @@ public String loginUser(@javax.annotation.Nonnull String username, @javax.annota * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity loginUserWithHttpInfo(@javax.annotation.Nonnull String username, @javax.annotation.Nonnull String password) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -310,10 +304,10 @@ public ResponseEntity loginUserWithHttpInfo(@javax.annotation.Nonnull St } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); @@ -329,7 +323,7 @@ public ResponseEntity loginUserWithHttpInfo(@javax.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Logs out current logged in user session @@ -349,13 +343,12 @@ public void logoutUser() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity logoutUserWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -365,7 +358,7 @@ public ResponseEntity logoutUserWithHttpInfo() throws RestClientException String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Updated user @@ -391,7 +384,6 @@ public void updateUser(@javax.annotation.Nonnull String username, @javax.annotat * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity updateUserWithHttpInfo(@javax.annotation.Nonnull String username, @javax.annotation.Nonnull User user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'username' is set if (username == null) { @@ -404,13 +396,13 @@ public ResponseEntity updateUserWithHttpInfo(@javax.annotation.Nonnull Str } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -422,19 +414,18 @@ public ResponseEntity updateUserWithHttpInfo(@javax.annotation.Nonnull Str String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, uriVariables, localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -445,6 +436,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { "api_key" }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-swagger2/pom.xml b/samples/client/petstore/java/resttemplate-swagger2/pom.xml index 012b16e80f9c..f768220af25f 100644 --- a/samples/client/petstore/java/resttemplate-swagger2/pom.xml +++ b/samples/client/petstore/java/resttemplate-swagger2/pom.xml @@ -145,10 +145,8 @@ maven-compiler-plugin 3.11.0 - 1.8 1.8 - diff --git a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/api/PetApi.java index 6dc7093d053c..706c80f1c5b1 100644 --- a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/api/PetApi.java @@ -60,7 +60,6 @@ public Pet addPet(@javax.annotation.Nonnull Pet pet) throws RestClientException * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet) throws RestClientException { - Object localVarPostBody = pet; // verify the required parameter 'pet' is set if (pet == null) { @@ -68,10 +67,10 @@ public ResponseEntity addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet) } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -85,7 +84,7 @@ public ResponseEntity addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet) String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Deletes a pet @@ -109,7 +108,6 @@ public void deletePet(@javax.annotation.Nonnull Long petId, @javax.annotation.Nu * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deletePetWithHttpInfo(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String apiKey) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -117,16 +115,17 @@ public ResponseEntity deletePetWithHttpInfo(@javax.annotation.Nonnull Long } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (apiKey != null) - localVarHeaderParams.add("api_key", apiClient.parameterToString(apiKey)); + if (apiKey != null) { + localVarHeaderParams.add("api_key", apiClient.parameterToString(apiKey)); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -136,7 +135,7 @@ public ResponseEntity deletePetWithHttpInfo(@javax.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Finds Pets by status @@ -161,7 +160,6 @@ public List findPetsByStatus(@javax.annotation.Nonnull List status) * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity> findPetsByStatusWithHttpInfo(@javax.annotation.Nonnull List status) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'status' is set if (status == null) { @@ -169,10 +167,10 @@ public ResponseEntity> findPetsByStatusWithHttpInfo(@javax.annotation. } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); @@ -187,7 +185,7 @@ public ResponseEntity> findPetsByStatusWithHttpInfo(@javax.annotation. String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Finds Pets by tags @@ -216,7 +214,6 @@ public List findPetsByTags(@javax.annotation.Nonnull List tags) thr */ @Deprecated public ResponseEntity> findPetsByTagsWithHttpInfo(@javax.annotation.Nonnull List tags) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'tags' is set if (tags == null) { @@ -224,10 +221,10 @@ public ResponseEntity> findPetsByTagsWithHttpInfo(@javax.annotation.No } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); @@ -242,7 +239,7 @@ public ResponseEntity> findPetsByTagsWithHttpInfo(@javax.annotation.No String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Find pet by ID @@ -269,7 +266,6 @@ public Pet getPetById(@javax.annotation.Nonnull Long petId) throws RestClientExc * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long petId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -277,13 +273,13 @@ public ResponseEntity getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -295,7 +291,7 @@ public ResponseEntity getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Update an existing pet @@ -328,7 +324,6 @@ public Pet updatePet(@javax.annotation.Nonnull Pet pet) throws RestClientExcepti * @see Update an existing pet Documentation */ public ResponseEntity updatePetWithHttpInfo(@javax.annotation.Nonnull Pet pet) throws RestClientException { - Object localVarPostBody = pet; // verify the required parameter 'pet' is set if (pet == null) { @@ -336,10 +331,10 @@ public ResponseEntity updatePetWithHttpInfo(@javax.annotation.Nonnull Pet p } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -353,7 +348,7 @@ public ResponseEntity updatePetWithHttpInfo(@javax.annotation.Nonnull Pet p String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Updates a pet in the store with form data @@ -379,7 +374,6 @@ public void updatePetWithForm(@javax.annotation.Nonnull Long petId, @javax.annot * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity updatePetWithFormWithHttpInfo(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String name, @javax.annotation.Nullable String status) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -387,18 +381,20 @@ public ResponseEntity updatePetWithFormWithHttpInfo(@javax.annotation.Nonn } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (name != null) + if (name != null) { localVarFormParams.add("name", name); - if (status != null) + } + if (status != null) { localVarFormParams.add("status", status); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -410,7 +406,7 @@ public ResponseEntity updatePetWithFormWithHttpInfo(@javax.annotation.Nonn String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * uploads an image @@ -437,7 +433,6 @@ public ModelApiResponse uploadFile(@javax.annotation.Nonnull Long petId, @javax. * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity uploadFileWithHttpInfo(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String additionalMetadata, @javax.annotation.Nullable File _file) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -445,18 +440,20 @@ public ResponseEntity uploadFileWithHttpInfo(@javax.annotation } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { localVarFormParams.add("additionalMetadata", additionalMetadata); - if (_file != null) + } + if (_file != null) { localVarFormParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { "application/json" @@ -470,19 +467,18 @@ public ResponseEntity uploadFileWithHttpInfo(@javax.annotation String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -495,6 +491,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { "petstore_auth" }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/api/StoreApi.java index 22cfbd8311bc..5d8aba78c26d 100644 --- a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/api/StoreApi.java @@ -57,7 +57,6 @@ public void deleteOrder(@javax.annotation.Nonnull String orderId) throws RestCli * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deleteOrderWithHttpInfo(@javax.annotation.Nonnull String orderId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { @@ -65,13 +64,13 @@ public ResponseEntity deleteOrderWithHttpInfo(@javax.annotation.Nonnull St } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("orderId", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -81,7 +80,7 @@ public ResponseEntity deleteOrderWithHttpInfo(@javax.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{orderId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/order/{orderId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Returns pet inventories by status @@ -102,13 +101,12 @@ public Map getInventory() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity> getInventoryWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -120,7 +118,7 @@ public ResponseEntity> getInventoryWithHttpInfo() throws Re String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Find purchase order by ID @@ -147,7 +145,6 @@ public Order getOrderById(@javax.annotation.Nonnull Long orderId) throws RestCli * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getOrderByIdWithHttpInfo(@javax.annotation.Nonnull Long orderId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { @@ -155,13 +152,13 @@ public ResponseEntity getOrderByIdWithHttpInfo(@javax.annotation.Nonnull } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("orderId", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -173,7 +170,7 @@ public ResponseEntity getOrderByIdWithHttpInfo(@javax.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{orderId}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/order/{orderId}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Place an order for a pet @@ -198,7 +195,6 @@ public Order placeOrder(@javax.annotation.Nonnull Order order) throws RestClient * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity placeOrderWithHttpInfo(@javax.annotation.Nonnull Order order) throws RestClientException { - Object localVarPostBody = order; // verify the required parameter 'order' is set if (order == null) { @@ -206,10 +202,10 @@ public ResponseEntity placeOrderWithHttpInfo(@javax.annotation.Nonnull Or } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -223,19 +219,18 @@ public ResponseEntity placeOrderWithHttpInfo(@javax.annotation.Nonnull Or String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, order, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -248,6 +243,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/api/UserApi.java index ada00fe4fc7d..14a1daa5c286 100644 --- a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/api/UserApi.java @@ -56,7 +56,6 @@ public void createUser(@javax.annotation.Nonnull User user) throws RestClientExc * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUserWithHttpInfo(@javax.annotation.Nonnull User user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -64,10 +63,10 @@ public ResponseEntity createUserWithHttpInfo(@javax.annotation.Nonnull Use } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -79,7 +78,7 @@ public ResponseEntity createUserWithHttpInfo(@javax.annotation.Nonnull Use String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Creates list of users with given input array @@ -101,7 +100,6 @@ public void createUsersWithArrayInput(@javax.annotation.Nonnull List user) * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@javax.annotation.Nonnull List user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -109,10 +107,10 @@ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@javax.annotat } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -124,7 +122,7 @@ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@javax.annotat String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Creates list of users with given input array @@ -146,7 +144,6 @@ public void createUsersWithListInput(@javax.annotation.Nonnull List user) * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUsersWithListInputWithHttpInfo(@javax.annotation.Nonnull List user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -154,10 +151,10 @@ public ResponseEntity createUsersWithListInputWithHttpInfo(@javax.annotati } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -169,7 +166,7 @@ public ResponseEntity createUsersWithListInputWithHttpInfo(@javax.annotati String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Delete user @@ -193,7 +190,6 @@ public void deleteUser(@javax.annotation.Nonnull String username) throws RestCli * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deleteUserWithHttpInfo(@javax.annotation.Nonnull String username) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -201,13 +197,13 @@ public ResponseEntity deleteUserWithHttpInfo(@javax.annotation.Nonnull Str } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -217,7 +213,7 @@ public ResponseEntity deleteUserWithHttpInfo(@javax.annotation.Nonnull Str String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Get user by user name @@ -244,7 +240,6 @@ public User getUserByName(@javax.annotation.Nonnull String username) throws Rest * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getUserByNameWithHttpInfo(@javax.annotation.Nonnull String username) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -252,13 +247,13 @@ public ResponseEntity getUserByNameWithHttpInfo(@javax.annotation.Nonnull } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -270,7 +265,7 @@ public ResponseEntity getUserByNameWithHttpInfo(@javax.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Logs user into the system @@ -297,7 +292,6 @@ public String loginUser(@javax.annotation.Nonnull String username, @javax.annota * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity loginUserWithHttpInfo(@javax.annotation.Nonnull String username, @javax.annotation.Nonnull String password) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -310,10 +304,10 @@ public ResponseEntity loginUserWithHttpInfo(@javax.annotation.Nonnull St } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); @@ -329,7 +323,7 @@ public ResponseEntity loginUserWithHttpInfo(@javax.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Logs out current logged in user session @@ -349,13 +343,12 @@ public void logoutUser() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity logoutUserWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -365,7 +358,7 @@ public ResponseEntity logoutUserWithHttpInfo() throws RestClientException String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Updated user @@ -391,7 +384,6 @@ public void updateUser(@javax.annotation.Nonnull String username, @javax.annotat * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity updateUserWithHttpInfo(@javax.annotation.Nonnull String username, @javax.annotation.Nonnull User user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'username' is set if (username == null) { @@ -404,13 +396,13 @@ public ResponseEntity updateUserWithHttpInfo(@javax.annotation.Nonnull Str } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -422,19 +414,18 @@ public ResponseEntity updateUserWithHttpInfo(@javax.annotation.Nonnull Str String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, uriVariables, localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -445,6 +436,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { "api_key" }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-withXml/pom.xml b/samples/client/petstore/java/resttemplate-withXml/pom.xml index 273969df1a6f..60477e4095d1 100644 --- a/samples/client/petstore/java/resttemplate-withXml/pom.xml +++ b/samples/client/petstore/java/resttemplate-withXml/pom.xml @@ -145,10 +145,8 @@ maven-compiler-plugin 3.11.0 - 1.8 1.8 - diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 6eb36e61e1b7..18c8f8d4e62d 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -56,7 +56,6 @@ public Client call123testSpecialTags(@javax.annotation.Nonnull Client client) th * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity call123testSpecialTagsWithHttpInfo(@javax.annotation.Nonnull Client client) throws RestClientException { - Object localVarPostBody = client; // verify the required parameter 'client' is set if (client == null) { @@ -64,10 +63,10 @@ public ResponseEntity call123testSpecialTagsWithHttpInfo(@javax.annotati } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -81,19 +80,18 @@ public ResponseEntity call123testSpecialTagsWithHttpInfo(@javax.annotati String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, Collections.emptyMap(), localVarQueryParams, client, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -106,6 +104,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/DefaultApi.java index 5fe4976f3182..6607bf2383a0 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -54,13 +54,12 @@ public FooGetDefaultResponse fooGet() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fooGetWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -72,19 +71,18 @@ public ResponseEntity fooGetWithHttpInfo() throws RestCli String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -95,6 +93,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java index 8d94751429a1..d889b7d1ae13 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java @@ -68,13 +68,12 @@ public FakeBigDecimalMap200Response fakeBigDecimalMap() throws RestClientExcepti * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakeBigDecimalMapWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -86,7 +85,7 @@ public ResponseEntity fakeBigDecimalMapWithHttpInf String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Health check endpoint @@ -107,13 +106,12 @@ public HealthCheckResult fakeHealthGet() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakeHealthGetWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -125,7 +123,7 @@ public ResponseEntity fakeHealthGetWithHttpInfo() throws Rest String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * test http signature authentication @@ -151,7 +149,6 @@ public void fakeHttpSignatureTest(@javax.annotation.Nonnull Pet pet, @javax.anno * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakeHttpSignatureTestWithHttpInfo(@javax.annotation.Nonnull Pet pet, @javax.annotation.Nullable String query1, @javax.annotation.Nullable String header1) throws RestClientException { - Object localVarPostBody = pet; // verify the required parameter 'pet' is set if (pet == null) { @@ -159,16 +156,17 @@ public ResponseEntity fakeHttpSignatureTestWithHttpInfo(@javax.annotation. } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); - if (header1 != null) - localVarHeaderParams.add("header_1", apiClient.parameterToString(header1)); + if (header1 != null) { + localVarHeaderParams.add("header_1", apiClient.parameterToString(header1)); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -180,7 +178,7 @@ public ResponseEntity fakeHttpSignatureTestWithHttpInfo(@javax.annotation. String[] localVarAuthNames = new String[] { "http_signature_test" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -203,13 +201,12 @@ public Boolean fakeOuterBooleanSerialize(@javax.annotation.Nullable Boolean body * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakeOuterBooleanSerializeWithHttpInfo(@javax.annotation.Nullable Boolean body) throws RestClientException { - Object localVarPostBody = body; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -223,7 +220,7 @@ public ResponseEntity fakeOuterBooleanSerializeWithHttpInfo(@javax.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, body, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -246,13 +243,12 @@ public OuterComposite fakeOuterCompositeSerialize(@javax.annotation.Nullable Out * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakeOuterCompositeSerializeWithHttpInfo(@javax.annotation.Nullable OuterComposite outerComposite) throws RestClientException { - Object localVarPostBody = outerComposite; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -266,7 +262,7 @@ public ResponseEntity fakeOuterCompositeSerializeWithHttpInfo(@j String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, outerComposite, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -289,13 +285,12 @@ public BigDecimal fakeOuterNumberSerialize(@javax.annotation.Nullable BigDecimal * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakeOuterNumberSerializeWithHttpInfo(@javax.annotation.Nullable BigDecimal body) throws RestClientException { - Object localVarPostBody = body; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -309,7 +304,7 @@ public ResponseEntity fakeOuterNumberSerializeWithHttpInfo(@javax.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, body, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -332,13 +327,12 @@ public String fakeOuterStringSerialize(@javax.annotation.Nullable String body) t * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakeOuterStringSerializeWithHttpInfo(@javax.annotation.Nullable String body) throws RestClientException { - Object localVarPostBody = body; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -352,7 +346,7 @@ public ResponseEntity fakeOuterStringSerializeWithHttpInfo(@javax.annota String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, body, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -375,7 +369,6 @@ public OuterObjectWithEnumProperty fakePropertyEnumIntegerSerialize(@javax.annot * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakePropertyEnumIntegerSerializeWithHttpInfo(@javax.annotation.Nonnull OuterObjectWithEnumProperty outerObjectWithEnumProperty) throws RestClientException { - Object localVarPostBody = outerObjectWithEnumProperty; // verify the required parameter 'outerObjectWithEnumProperty' is set if (outerObjectWithEnumProperty == null) { @@ -383,10 +376,10 @@ public ResponseEntity fakePropertyEnumIntegerSerial } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -400,7 +393,7 @@ public ResponseEntity fakePropertyEnumIntegerSerial String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, outerObjectWithEnumProperty, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * test referenced additionalProperties @@ -422,7 +415,6 @@ public void testAdditionalPropertiesReference(@javax.annotation.Nonnull Map testAdditionalPropertiesReferenceWithHttpInfo(@javax.annotation.Nonnull Map requestBody) throws RestClientException { - Object localVarPostBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { @@ -430,10 +422,10 @@ public ResponseEntity testAdditionalPropertiesReferenceWithHttpInfo(@javax } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -445,7 +437,7 @@ public ResponseEntity testAdditionalPropertiesReferenceWithHttpInfo(@javax String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, requestBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -467,7 +459,6 @@ public void testBodyWithBinary(@javax.annotation.Nullable File body) throws Rest * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testBodyWithBinaryWithHttpInfo(@javax.annotation.Nullable File body) throws RestClientException { - Object localVarPostBody = body; // verify the required parameter 'body' is set if (body == null) { @@ -475,10 +466,10 @@ public ResponseEntity testBodyWithBinaryWithHttpInfo(@javax.annotation.Nul } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -490,7 +481,7 @@ public ResponseEntity testBodyWithBinaryWithHttpInfo(@javax.annotation.Nul String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, body, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -512,7 +503,6 @@ public void testBodyWithFileSchema(@javax.annotation.Nonnull FileSchemaTestClass * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testBodyWithFileSchemaWithHttpInfo(@javax.annotation.Nonnull FileSchemaTestClass fileSchemaTestClass) throws RestClientException { - Object localVarPostBody = fileSchemaTestClass; // verify the required parameter 'fileSchemaTestClass' is set if (fileSchemaTestClass == null) { @@ -520,10 +510,10 @@ public ResponseEntity testBodyWithFileSchemaWithHttpInfo(@javax.annotation } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -535,7 +525,7 @@ public ResponseEntity testBodyWithFileSchemaWithHttpInfo(@javax.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, fileSchemaTestClass, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -559,7 +549,6 @@ public void testBodyWithQueryParams(@javax.annotation.Nonnull String query, @jav * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testBodyWithQueryParamsWithHttpInfo(@javax.annotation.Nonnull String query, @javax.annotation.Nonnull User user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'query' is set if (query == null) { @@ -572,10 +561,10 @@ public ResponseEntity testBodyWithQueryParamsWithHttpInfo(@javax.annotatio } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); @@ -590,7 +579,7 @@ public ResponseEntity testBodyWithQueryParamsWithHttpInfo(@javax.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * To test \"client\" model @@ -613,7 +602,6 @@ public Client testClientModel(@javax.annotation.Nonnull Client client) throws Re * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testClientModelWithHttpInfo(@javax.annotation.Nonnull Client client) throws RestClientException { - Object localVarPostBody = client; // verify the required parameter 'client' is set if (client == null) { @@ -621,10 +609,10 @@ public ResponseEntity testClientModelWithHttpInfo(@javax.annotation.Nonn } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -638,7 +626,7 @@ public ResponseEntity testClientModelWithHttpInfo(@javax.annotation.Nonn String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, Collections.emptyMap(), localVarQueryParams, client, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -688,7 +676,6 @@ public void testEndpointParameters(@javax.annotation.Nonnull BigDecimal number, * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testEndpointParametersWithHttpInfo(@javax.annotation.Nonnull BigDecimal number, @javax.annotation.Nonnull Double _double, @javax.annotation.Nonnull String patternWithoutDelimiter, @javax.annotation.Nonnull byte[] _byte, @javax.annotation.Nullable Integer integer, @javax.annotation.Nullable Integer int32, @javax.annotation.Nullable Long int64, @javax.annotation.Nullable Float _float, @javax.annotation.Nullable String string, @javax.annotation.Nullable File binary, @javax.annotation.Nullable LocalDate date, @javax.annotation.Nullable OffsetDateTime dateTime, @javax.annotation.Nullable String password, @javax.annotation.Nullable String paramCallback) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'number' is set if (number == null) { @@ -711,39 +698,45 @@ public ResponseEntity testEndpointParametersWithHttpInfo(@javax.annotation } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (integer != null) + if (integer != null) { localVarFormParams.add("integer", integer); - if (int32 != null) + } + if (int32 != null) { localVarFormParams.add("int32", int32); - if (int64 != null) + } + if (int64 != null) { localVarFormParams.add("int64", int64); - if (number != null) - localVarFormParams.add("number", number); - if (_float != null) + } + localVarFormParams.add("number", number); + if (_float != null) { localVarFormParams.add("float", _float); - if (_double != null) - localVarFormParams.add("double", _double); - if (string != null) + } + localVarFormParams.add("double", _double); + if (string != null) { localVarFormParams.add("string", string); - if (patternWithoutDelimiter != null) - localVarFormParams.add("pattern_without_delimiter", patternWithoutDelimiter); - if (_byte != null) - localVarFormParams.add("byte", _byte); - if (binary != null) + } + localVarFormParams.add("pattern_without_delimiter", patternWithoutDelimiter); + localVarFormParams.add("byte", _byte); + if (binary != null) { localVarFormParams.add("binary", new FileSystemResource(binary)); - if (date != null) + } + if (date != null) { localVarFormParams.add("date", date); - if (dateTime != null) + } + if (dateTime != null) { localVarFormParams.add("dateTime", dateTime); - if (password != null) + } + if (password != null) { localVarFormParams.add("password", password); - if (paramCallback != null) + } + if (paramCallback != null) { localVarFormParams.add("callback", paramCallback); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -755,7 +748,7 @@ public ResponseEntity testEndpointParametersWithHttpInfo(@javax.annotation String[] localVarAuthNames = new String[] { "http_basic_test" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * To test enum parameters @@ -795,13 +788,12 @@ public void testEnumParameters(@javax.annotation.Nullable List enumHeade * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testEnumParametersWithHttpInfo(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString)); @@ -810,15 +802,19 @@ public ResponseEntity testEnumParametersWithHttpInfo(@javax.annotation.Nul localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); - if (enumHeaderStringArray != null) - localVarHeaderParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); - if (enumHeaderString != null) - localVarHeaderParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + if (enumHeaderStringArray != null) { + localVarHeaderParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); + } + if (enumHeaderString != null) { + localVarHeaderParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + } - if (enumFormStringArray != null) + if (enumFormStringArray != null) { localVarFormParams.addAll("enum_form_string_array", enumFormStringArray); - if (enumFormString != null) + } + if (enumFormString != null) { localVarFormParams.add("enum_form_string", enumFormString); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -830,7 +826,7 @@ public ResponseEntity testEnumParametersWithHttpInfo(@javax.annotation.Nul String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Fake endpoint to test group parameters (optional) @@ -862,7 +858,6 @@ public void testGroupParameters(@javax.annotation.Nonnull Integer requiredString * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testGroupParametersWithHttpInfo(@javax.annotation.Nonnull Integer requiredStringGroup, @javax.annotation.Nonnull Boolean requiredBooleanGroup, @javax.annotation.Nonnull Long requiredInt64Group, @javax.annotation.Nullable Integer stringGroup, @javax.annotation.Nullable Boolean booleanGroup, @javax.annotation.Nullable Long int64Group) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'requiredStringGroup' is set if (requiredStringGroup == null) { @@ -880,10 +875,10 @@ public ResponseEntity testGroupParametersWithHttpInfo(@javax.annotation.No } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group)); @@ -891,10 +886,10 @@ public ResponseEntity testGroupParametersWithHttpInfo(@javax.annotation.No localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); - if (requiredBooleanGroup != null) localVarHeaderParams.add("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); - if (booleanGroup != null) - localVarHeaderParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + if (booleanGroup != null) { + localVarHeaderParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -904,7 +899,7 @@ public ResponseEntity testGroupParametersWithHttpInfo(@javax.annotation.No String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * test inline additionalProperties @@ -926,7 +921,6 @@ public void testInlineAdditionalProperties(@javax.annotation.Nonnull Map testInlineAdditionalPropertiesWithHttpInfo(@javax.annotation.Nonnull Map requestBody) throws RestClientException { - Object localVarPostBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { @@ -934,10 +928,10 @@ public ResponseEntity testInlineAdditionalPropertiesWithHttpInfo(@javax.an } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -949,7 +943,7 @@ public ResponseEntity testInlineAdditionalPropertiesWithHttpInfo(@javax.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, requestBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * test inline free-form additionalProperties @@ -971,7 +965,6 @@ public void testInlineFreeformAdditionalProperties(@javax.annotation.Nonnull Tes * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testInlineFreeformAdditionalPropertiesWithHttpInfo(@javax.annotation.Nonnull TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest) throws RestClientException { - Object localVarPostBody = testInlineFreeformAdditionalPropertiesRequest; // verify the required parameter 'testInlineFreeformAdditionalPropertiesRequest' is set if (testInlineFreeformAdditionalPropertiesRequest == null) { @@ -979,10 +972,10 @@ public ResponseEntity testInlineFreeformAdditionalPropertiesWithHttpInfo(@ } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -994,7 +987,7 @@ public ResponseEntity testInlineFreeformAdditionalPropertiesWithHttpInfo(@ String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, testInlineFreeformAdditionalPropertiesRequest, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * test json serialization of form data @@ -1018,7 +1011,6 @@ public void testJsonFormData(@javax.annotation.Nonnull String param, @javax.anno * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testJsonFormDataWithHttpInfo(@javax.annotation.Nonnull String param, @javax.annotation.Nonnull String param2) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'param' is set if (param == null) { @@ -1031,15 +1023,13 @@ public ResponseEntity testJsonFormDataWithHttpInfo(@javax.annotation.Nonnu } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (param != null) - localVarFormParams.add("param", param); - if (param2 != null) - localVarFormParams.add("param2", param2); + localVarFormParams.add("param", param); + localVarFormParams.add("param2", param2); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1051,7 +1041,7 @@ public ResponseEntity testJsonFormDataWithHttpInfo(@javax.annotation.Nonnu String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * test nullable parent property @@ -1073,7 +1063,6 @@ public void testNullable(@javax.annotation.Nonnull ChildWithNullable childWithNu * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testNullableWithHttpInfo(@javax.annotation.Nonnull ChildWithNullable childWithNullable) throws RestClientException { - Object localVarPostBody = childWithNullable; // verify the required parameter 'childWithNullable' is set if (childWithNullable == null) { @@ -1081,10 +1070,10 @@ public ResponseEntity testNullableWithHttpInfo(@javax.annotation.Nonnull C } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1096,7 +1085,7 @@ public ResponseEntity testNullableWithHttpInfo(@javax.annotation.Nonnull C String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, childWithNullable, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -1130,7 +1119,6 @@ public void testQueryParameterCollectionFormat(@javax.annotation.Nonnull List testQueryParameterCollectionFormatWithHttpInfo(@javax.annotation.Nonnull List pipe, @javax.annotation.Nonnull List ioutil, @javax.annotation.Nonnull List http, @javax.annotation.Nonnull List url, @javax.annotation.Nonnull List context, @javax.annotation.Nonnull String allowEmpty, @javax.annotation.Nullable Map language) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'pipe' is set if (pipe == null) { @@ -1163,10 +1151,10 @@ public ResponseEntity testQueryParameterCollectionFormatWithHttpInfo(@java } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("pipes".toUpperCase(Locale.ROOT)), "pipe", pipe)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil)); @@ -1185,7 +1173,7 @@ public ResponseEntity testQueryParameterCollectionFormatWithHttpInfo(@java String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * test referenced string map @@ -1207,7 +1195,6 @@ public void testStringMapReference(@javax.annotation.Nonnull Map * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testStringMapReferenceWithHttpInfo(@javax.annotation.Nonnull Map requestBody) throws RestClientException { - Object localVarPostBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { @@ -1215,10 +1202,10 @@ public ResponseEntity testStringMapReferenceWithHttpInfo(@javax.annotation } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1230,19 +1217,18 @@ public ResponseEntity testStringMapReferenceWithHttpInfo(@javax.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, requestBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1253,6 +1239,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 27296c53463c..4125b718577d 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -56,7 +56,6 @@ public Client testClassname(@javax.annotation.Nonnull Client client) throws Rest * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testClassnameWithHttpInfo(@javax.annotation.Nonnull Client client) throws RestClientException { - Object localVarPostBody = client; // verify the required parameter 'client' is set if (client == null) { @@ -64,10 +63,10 @@ public ResponseEntity testClassnameWithHttpInfo(@javax.annotation.Nonnul } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -81,19 +80,18 @@ public ResponseEntity testClassnameWithHttpInfo(@javax.annotation.Nonnul String[] localVarAuthNames = new String[] { "api_key_query" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, Collections.emptyMap(), localVarQueryParams, client, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -106,6 +104,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { "api_key_query" }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java index 6627f9df4778..96c2c840ae5a 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java @@ -60,7 +60,6 @@ public void addPet(@javax.annotation.Nonnull Pet pet) throws RestClientException * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet) throws RestClientException { - Object localVarPostBody = pet; // verify the required parameter 'pet' is set if (pet == null) { @@ -68,10 +67,10 @@ public ResponseEntity addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -83,7 +82,7 @@ public ResponseEntity addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Deletes a pet @@ -109,7 +108,6 @@ public void deletePet(@javax.annotation.Nonnull Long petId, @javax.annotation.Nu * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deletePetWithHttpInfo(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String apiKey) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -117,16 +115,17 @@ public ResponseEntity deletePetWithHttpInfo(@javax.annotation.Nonnull Long } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (apiKey != null) - localVarHeaderParams.add("api_key", apiClient.parameterToString(apiKey)); + if (apiKey != null) { + localVarHeaderParams.add("api_key", apiClient.parameterToString(apiKey)); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -136,7 +135,7 @@ public ResponseEntity deletePetWithHttpInfo(@javax.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Finds Pets by status @@ -161,7 +160,6 @@ public List findPetsByStatus(@javax.annotation.Nonnull List status) * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity> findPetsByStatusWithHttpInfo(@javax.annotation.Nonnull List status) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'status' is set if (status == null) { @@ -169,10 +167,10 @@ public ResponseEntity> findPetsByStatusWithHttpInfo(@javax.annotation. } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); @@ -187,7 +185,7 @@ public ResponseEntity> findPetsByStatusWithHttpInfo(@javax.annotation. String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Finds Pets by tags @@ -216,7 +214,6 @@ public Set findPetsByTags(@javax.annotation.Nonnull Set tags) throw */ @Deprecated public ResponseEntity> findPetsByTagsWithHttpInfo(@javax.annotation.Nonnull Set tags) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'tags' is set if (tags == null) { @@ -224,10 +221,10 @@ public ResponseEntity> findPetsByTagsWithHttpInfo(@javax.annotation.Non } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); @@ -242,7 +239,7 @@ public ResponseEntity> findPetsByTagsWithHttpInfo(@javax.annotation.Non String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Find pet by ID @@ -269,7 +266,6 @@ public Pet getPetById(@javax.annotation.Nonnull Long petId) throws RestClientExc * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long petId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -277,13 +273,13 @@ public ResponseEntity getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -295,7 +291,7 @@ public ResponseEntity getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Update an existing pet @@ -323,7 +319,6 @@ public void updatePet(@javax.annotation.Nonnull Pet pet) throws RestClientExcept * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity updatePetWithHttpInfo(@javax.annotation.Nonnull Pet pet) throws RestClientException { - Object localVarPostBody = pet; // verify the required parameter 'pet' is set if (pet == null) { @@ -331,10 +326,10 @@ public ResponseEntity updatePetWithHttpInfo(@javax.annotation.Nonnull Pet } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -346,7 +341,7 @@ public ResponseEntity updatePetWithHttpInfo(@javax.annotation.Nonnull Pet String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Updates a pet in the store with form data @@ -374,7 +369,6 @@ public void updatePetWithForm(@javax.annotation.Nonnull Long petId, @javax.annot * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity updatePetWithFormWithHttpInfo(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String name, @javax.annotation.Nullable String status) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -382,18 +376,20 @@ public ResponseEntity updatePetWithFormWithHttpInfo(@javax.annotation.Nonn } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (name != null) + if (name != null) { localVarFormParams.add("name", name); - if (status != null) + } + if (status != null) { localVarFormParams.add("status", status); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -405,7 +401,7 @@ public ResponseEntity updatePetWithFormWithHttpInfo(@javax.annotation.Nonn String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * uploads an image @@ -432,7 +428,6 @@ public ModelApiResponse uploadFile(@javax.annotation.Nonnull Long petId, @javax. * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity uploadFileWithHttpInfo(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String additionalMetadata, @javax.annotation.Nullable File _file) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -440,18 +435,20 @@ public ResponseEntity uploadFileWithHttpInfo(@javax.annotation } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { localVarFormParams.add("additionalMetadata", additionalMetadata); - if (_file != null) + } + if (_file != null) { localVarFormParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { "application/json" @@ -465,7 +462,7 @@ public ResponseEntity uploadFileWithHttpInfo(@javax.annotation String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * uploads an image (required) @@ -492,7 +489,6 @@ public ModelApiResponse uploadFileWithRequiredFile(@javax.annotation.Nonnull Lon * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity uploadFileWithRequiredFileWithHttpInfo(@javax.annotation.Nonnull Long petId, @javax.annotation.Nonnull File requiredFile, @javax.annotation.Nullable String additionalMetadata) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -505,18 +501,18 @@ public ResponseEntity uploadFileWithRequiredFileWithHttpInfo(@ } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { localVarFormParams.add("additionalMetadata", additionalMetadata); - if (requiredFile != null) - localVarFormParams.add("requiredFile", new FileSystemResource(requiredFile)); + } + localVarFormParams.add("requiredFile", new FileSystemResource(requiredFile)); final String[] localVarAccepts = { "application/json" @@ -530,19 +526,18 @@ public ResponseEntity uploadFileWithRequiredFileWithHttpInfo(@ String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -555,6 +550,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { "petstore_auth" }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java index e96c855cbf3e..6d48da6d062e 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java @@ -57,7 +57,6 @@ public void deleteOrder(@javax.annotation.Nonnull String orderId) throws RestCli * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deleteOrderWithHttpInfo(@javax.annotation.Nonnull String orderId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { @@ -65,13 +64,13 @@ public ResponseEntity deleteOrderWithHttpInfo(@javax.annotation.Nonnull St } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("order_id", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -81,7 +80,7 @@ public ResponseEntity deleteOrderWithHttpInfo(@javax.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Returns pet inventories by status @@ -102,13 +101,12 @@ public Map getInventory() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity> getInventoryWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -120,7 +118,7 @@ public ResponseEntity> getInventoryWithHttpInfo() throws Re String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Find purchase order by ID @@ -147,7 +145,6 @@ public Order getOrderById(@javax.annotation.Nonnull Long orderId) throws RestCli * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getOrderByIdWithHttpInfo(@javax.annotation.Nonnull Long orderId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { @@ -155,13 +152,13 @@ public ResponseEntity getOrderByIdWithHttpInfo(@javax.annotation.Nonnull } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("order_id", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -173,7 +170,7 @@ public ResponseEntity getOrderByIdWithHttpInfo(@javax.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Place an order for a pet @@ -198,7 +195,6 @@ public Order placeOrder(@javax.annotation.Nonnull Order order) throws RestClient * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity placeOrderWithHttpInfo(@javax.annotation.Nonnull Order order) throws RestClientException { - Object localVarPostBody = order; // verify the required parameter 'order' is set if (order == null) { @@ -206,10 +202,10 @@ public ResponseEntity placeOrderWithHttpInfo(@javax.annotation.Nonnull Or } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -223,19 +219,18 @@ public ResponseEntity placeOrderWithHttpInfo(@javax.annotation.Nonnull Or String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, order, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -248,6 +243,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java index da5e14fb14ad..654dcd56716f 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java @@ -56,7 +56,6 @@ public void createUser(@javax.annotation.Nonnull User user) throws RestClientExc * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUserWithHttpInfo(@javax.annotation.Nonnull User user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -64,10 +63,10 @@ public ResponseEntity createUserWithHttpInfo(@javax.annotation.Nonnull Use } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -79,7 +78,7 @@ public ResponseEntity createUserWithHttpInfo(@javax.annotation.Nonnull Use String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Creates list of users with given input array @@ -101,7 +100,6 @@ public void createUsersWithArrayInput(@javax.annotation.Nonnull List user) * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@javax.annotation.Nonnull List user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -109,10 +107,10 @@ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@javax.annotat } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -124,7 +122,7 @@ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@javax.annotat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Creates list of users with given input array @@ -146,7 +144,6 @@ public void createUsersWithListInput(@javax.annotation.Nonnull List user) * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUsersWithListInputWithHttpInfo(@javax.annotation.Nonnull List user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -154,10 +151,10 @@ public ResponseEntity createUsersWithListInputWithHttpInfo(@javax.annotati } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -169,7 +166,7 @@ public ResponseEntity createUsersWithListInputWithHttpInfo(@javax.annotati String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Delete user @@ -193,7 +190,6 @@ public void deleteUser(@javax.annotation.Nonnull String username) throws RestCli * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deleteUserWithHttpInfo(@javax.annotation.Nonnull String username) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -201,13 +197,13 @@ public ResponseEntity deleteUserWithHttpInfo(@javax.annotation.Nonnull Str } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -217,7 +213,7 @@ public ResponseEntity deleteUserWithHttpInfo(@javax.annotation.Nonnull Str String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Get user by user name @@ -244,7 +240,6 @@ public User getUserByName(@javax.annotation.Nonnull String username) throws Rest * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getUserByNameWithHttpInfo(@javax.annotation.Nonnull String username) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -252,13 +247,13 @@ public ResponseEntity getUserByNameWithHttpInfo(@javax.annotation.Nonnull } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -270,7 +265,7 @@ public ResponseEntity getUserByNameWithHttpInfo(@javax.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Logs user into the system @@ -297,7 +292,6 @@ public String loginUser(@javax.annotation.Nonnull String username, @javax.annota * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity loginUserWithHttpInfo(@javax.annotation.Nonnull String username, @javax.annotation.Nonnull String password) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -310,10 +304,10 @@ public ResponseEntity loginUserWithHttpInfo(@javax.annotation.Nonnull St } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); @@ -329,7 +323,7 @@ public ResponseEntity loginUserWithHttpInfo(@javax.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Logs out current logged in user session @@ -349,13 +343,12 @@ public void logoutUser() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity logoutUserWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -365,7 +358,7 @@ public ResponseEntity logoutUserWithHttpInfo() throws RestClientException String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Updated user @@ -391,7 +384,6 @@ public void updateUser(@javax.annotation.Nonnull String username, @javax.annotat * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity updateUserWithHttpInfo(@javax.annotation.Nonnull String username, @javax.annotation.Nonnull User user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'username' is set if (username == null) { @@ -404,13 +396,13 @@ public ResponseEntity updateUserWithHttpInfo(@javax.annotation.Nonnull Str } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -422,19 +414,18 @@ public ResponseEntity updateUserWithHttpInfo(@javax.annotation.Nonnull Str String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, uriVariables, localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -445,6 +436,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate/pom.xml b/samples/client/petstore/java/resttemplate/pom.xml index 76424cefc353..fa2f32032139 100644 --- a/samples/client/petstore/java/resttemplate/pom.xml +++ b/samples/client/petstore/java/resttemplate/pom.xml @@ -145,10 +145,8 @@ maven-compiler-plugin 3.11.0 - 1.8 1.8 - diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 6eb36e61e1b7..18c8f8d4e62d 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -56,7 +56,6 @@ public Client call123testSpecialTags(@javax.annotation.Nonnull Client client) th * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity call123testSpecialTagsWithHttpInfo(@javax.annotation.Nonnull Client client) throws RestClientException { - Object localVarPostBody = client; // verify the required parameter 'client' is set if (client == null) { @@ -64,10 +63,10 @@ public ResponseEntity call123testSpecialTagsWithHttpInfo(@javax.annotati } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -81,19 +80,18 @@ public ResponseEntity call123testSpecialTagsWithHttpInfo(@javax.annotati String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, Collections.emptyMap(), localVarQueryParams, client, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -106,6 +104,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/DefaultApi.java index 5fe4976f3182..6607bf2383a0 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -54,13 +54,12 @@ public FooGetDefaultResponse fooGet() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fooGetWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -72,19 +71,18 @@ public ResponseEntity fooGetWithHttpInfo() throws RestCli String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -95,6 +93,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java index 8d94751429a1..d889b7d1ae13 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java @@ -68,13 +68,12 @@ public FakeBigDecimalMap200Response fakeBigDecimalMap() throws RestClientExcepti * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakeBigDecimalMapWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -86,7 +85,7 @@ public ResponseEntity fakeBigDecimalMapWithHttpInf String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Health check endpoint @@ -107,13 +106,12 @@ public HealthCheckResult fakeHealthGet() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakeHealthGetWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -125,7 +123,7 @@ public ResponseEntity fakeHealthGetWithHttpInfo() throws Rest String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * test http signature authentication @@ -151,7 +149,6 @@ public void fakeHttpSignatureTest(@javax.annotation.Nonnull Pet pet, @javax.anno * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakeHttpSignatureTestWithHttpInfo(@javax.annotation.Nonnull Pet pet, @javax.annotation.Nullable String query1, @javax.annotation.Nullable String header1) throws RestClientException { - Object localVarPostBody = pet; // verify the required parameter 'pet' is set if (pet == null) { @@ -159,16 +156,17 @@ public ResponseEntity fakeHttpSignatureTestWithHttpInfo(@javax.annotation. } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); - if (header1 != null) - localVarHeaderParams.add("header_1", apiClient.parameterToString(header1)); + if (header1 != null) { + localVarHeaderParams.add("header_1", apiClient.parameterToString(header1)); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -180,7 +178,7 @@ public ResponseEntity fakeHttpSignatureTestWithHttpInfo(@javax.annotation. String[] localVarAuthNames = new String[] { "http_signature_test" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -203,13 +201,12 @@ public Boolean fakeOuterBooleanSerialize(@javax.annotation.Nullable Boolean body * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakeOuterBooleanSerializeWithHttpInfo(@javax.annotation.Nullable Boolean body) throws RestClientException { - Object localVarPostBody = body; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -223,7 +220,7 @@ public ResponseEntity fakeOuterBooleanSerializeWithHttpInfo(@javax.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, body, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -246,13 +243,12 @@ public OuterComposite fakeOuterCompositeSerialize(@javax.annotation.Nullable Out * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakeOuterCompositeSerializeWithHttpInfo(@javax.annotation.Nullable OuterComposite outerComposite) throws RestClientException { - Object localVarPostBody = outerComposite; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -266,7 +262,7 @@ public ResponseEntity fakeOuterCompositeSerializeWithHttpInfo(@j String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, outerComposite, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -289,13 +285,12 @@ public BigDecimal fakeOuterNumberSerialize(@javax.annotation.Nullable BigDecimal * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakeOuterNumberSerializeWithHttpInfo(@javax.annotation.Nullable BigDecimal body) throws RestClientException { - Object localVarPostBody = body; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -309,7 +304,7 @@ public ResponseEntity fakeOuterNumberSerializeWithHttpInfo(@javax.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, body, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -332,13 +327,12 @@ public String fakeOuterStringSerialize(@javax.annotation.Nullable String body) t * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakeOuterStringSerializeWithHttpInfo(@javax.annotation.Nullable String body) throws RestClientException { - Object localVarPostBody = body; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -352,7 +346,7 @@ public ResponseEntity fakeOuterStringSerializeWithHttpInfo(@javax.annota String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, body, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -375,7 +369,6 @@ public OuterObjectWithEnumProperty fakePropertyEnumIntegerSerialize(@javax.annot * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity fakePropertyEnumIntegerSerializeWithHttpInfo(@javax.annotation.Nonnull OuterObjectWithEnumProperty outerObjectWithEnumProperty) throws RestClientException { - Object localVarPostBody = outerObjectWithEnumProperty; // verify the required parameter 'outerObjectWithEnumProperty' is set if (outerObjectWithEnumProperty == null) { @@ -383,10 +376,10 @@ public ResponseEntity fakePropertyEnumIntegerSerial } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -400,7 +393,7 @@ public ResponseEntity fakePropertyEnumIntegerSerial String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, outerObjectWithEnumProperty, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * test referenced additionalProperties @@ -422,7 +415,6 @@ public void testAdditionalPropertiesReference(@javax.annotation.Nonnull Map testAdditionalPropertiesReferenceWithHttpInfo(@javax.annotation.Nonnull Map requestBody) throws RestClientException { - Object localVarPostBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { @@ -430,10 +422,10 @@ public ResponseEntity testAdditionalPropertiesReferenceWithHttpInfo(@javax } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -445,7 +437,7 @@ public ResponseEntity testAdditionalPropertiesReferenceWithHttpInfo(@javax String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, requestBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -467,7 +459,6 @@ public void testBodyWithBinary(@javax.annotation.Nullable File body) throws Rest * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testBodyWithBinaryWithHttpInfo(@javax.annotation.Nullable File body) throws RestClientException { - Object localVarPostBody = body; // verify the required parameter 'body' is set if (body == null) { @@ -475,10 +466,10 @@ public ResponseEntity testBodyWithBinaryWithHttpInfo(@javax.annotation.Nul } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -490,7 +481,7 @@ public ResponseEntity testBodyWithBinaryWithHttpInfo(@javax.annotation.Nul String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, body, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -512,7 +503,6 @@ public void testBodyWithFileSchema(@javax.annotation.Nonnull FileSchemaTestClass * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testBodyWithFileSchemaWithHttpInfo(@javax.annotation.Nonnull FileSchemaTestClass fileSchemaTestClass) throws RestClientException { - Object localVarPostBody = fileSchemaTestClass; // verify the required parameter 'fileSchemaTestClass' is set if (fileSchemaTestClass == null) { @@ -520,10 +510,10 @@ public ResponseEntity testBodyWithFileSchemaWithHttpInfo(@javax.annotation } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -535,7 +525,7 @@ public ResponseEntity testBodyWithFileSchemaWithHttpInfo(@javax.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, fileSchemaTestClass, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -559,7 +549,6 @@ public void testBodyWithQueryParams(@javax.annotation.Nonnull String query, @jav * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testBodyWithQueryParamsWithHttpInfo(@javax.annotation.Nonnull String query, @javax.annotation.Nonnull User user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'query' is set if (query == null) { @@ -572,10 +561,10 @@ public ResponseEntity testBodyWithQueryParamsWithHttpInfo(@javax.annotatio } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); @@ -590,7 +579,7 @@ public ResponseEntity testBodyWithQueryParamsWithHttpInfo(@javax.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * To test \"client\" model @@ -613,7 +602,6 @@ public Client testClientModel(@javax.annotation.Nonnull Client client) throws Re * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testClientModelWithHttpInfo(@javax.annotation.Nonnull Client client) throws RestClientException { - Object localVarPostBody = client; // verify the required parameter 'client' is set if (client == null) { @@ -621,10 +609,10 @@ public ResponseEntity testClientModelWithHttpInfo(@javax.annotation.Nonn } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -638,7 +626,7 @@ public ResponseEntity testClientModelWithHttpInfo(@javax.annotation.Nonn String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, Collections.emptyMap(), localVarQueryParams, client, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -688,7 +676,6 @@ public void testEndpointParameters(@javax.annotation.Nonnull BigDecimal number, * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testEndpointParametersWithHttpInfo(@javax.annotation.Nonnull BigDecimal number, @javax.annotation.Nonnull Double _double, @javax.annotation.Nonnull String patternWithoutDelimiter, @javax.annotation.Nonnull byte[] _byte, @javax.annotation.Nullable Integer integer, @javax.annotation.Nullable Integer int32, @javax.annotation.Nullable Long int64, @javax.annotation.Nullable Float _float, @javax.annotation.Nullable String string, @javax.annotation.Nullable File binary, @javax.annotation.Nullable LocalDate date, @javax.annotation.Nullable OffsetDateTime dateTime, @javax.annotation.Nullable String password, @javax.annotation.Nullable String paramCallback) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'number' is set if (number == null) { @@ -711,39 +698,45 @@ public ResponseEntity testEndpointParametersWithHttpInfo(@javax.annotation } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (integer != null) + if (integer != null) { localVarFormParams.add("integer", integer); - if (int32 != null) + } + if (int32 != null) { localVarFormParams.add("int32", int32); - if (int64 != null) + } + if (int64 != null) { localVarFormParams.add("int64", int64); - if (number != null) - localVarFormParams.add("number", number); - if (_float != null) + } + localVarFormParams.add("number", number); + if (_float != null) { localVarFormParams.add("float", _float); - if (_double != null) - localVarFormParams.add("double", _double); - if (string != null) + } + localVarFormParams.add("double", _double); + if (string != null) { localVarFormParams.add("string", string); - if (patternWithoutDelimiter != null) - localVarFormParams.add("pattern_without_delimiter", patternWithoutDelimiter); - if (_byte != null) - localVarFormParams.add("byte", _byte); - if (binary != null) + } + localVarFormParams.add("pattern_without_delimiter", patternWithoutDelimiter); + localVarFormParams.add("byte", _byte); + if (binary != null) { localVarFormParams.add("binary", new FileSystemResource(binary)); - if (date != null) + } + if (date != null) { localVarFormParams.add("date", date); - if (dateTime != null) + } + if (dateTime != null) { localVarFormParams.add("dateTime", dateTime); - if (password != null) + } + if (password != null) { localVarFormParams.add("password", password); - if (paramCallback != null) + } + if (paramCallback != null) { localVarFormParams.add("callback", paramCallback); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -755,7 +748,7 @@ public ResponseEntity testEndpointParametersWithHttpInfo(@javax.annotation String[] localVarAuthNames = new String[] { "http_basic_test" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * To test enum parameters @@ -795,13 +788,12 @@ public void testEnumParameters(@javax.annotation.Nullable List enumHeade * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testEnumParametersWithHttpInfo(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString)); @@ -810,15 +802,19 @@ public ResponseEntity testEnumParametersWithHttpInfo(@javax.annotation.Nul localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); - if (enumHeaderStringArray != null) - localVarHeaderParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); - if (enumHeaderString != null) - localVarHeaderParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + if (enumHeaderStringArray != null) { + localVarHeaderParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); + } + if (enumHeaderString != null) { + localVarHeaderParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + } - if (enumFormStringArray != null) + if (enumFormStringArray != null) { localVarFormParams.addAll("enum_form_string_array", enumFormStringArray); - if (enumFormString != null) + } + if (enumFormString != null) { localVarFormParams.add("enum_form_string", enumFormString); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -830,7 +826,7 @@ public ResponseEntity testEnumParametersWithHttpInfo(@javax.annotation.Nul String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Fake endpoint to test group parameters (optional) @@ -862,7 +858,6 @@ public void testGroupParameters(@javax.annotation.Nonnull Integer requiredString * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testGroupParametersWithHttpInfo(@javax.annotation.Nonnull Integer requiredStringGroup, @javax.annotation.Nonnull Boolean requiredBooleanGroup, @javax.annotation.Nonnull Long requiredInt64Group, @javax.annotation.Nullable Integer stringGroup, @javax.annotation.Nullable Boolean booleanGroup, @javax.annotation.Nullable Long int64Group) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'requiredStringGroup' is set if (requiredStringGroup == null) { @@ -880,10 +875,10 @@ public ResponseEntity testGroupParametersWithHttpInfo(@javax.annotation.No } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group)); @@ -891,10 +886,10 @@ public ResponseEntity testGroupParametersWithHttpInfo(@javax.annotation.No localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); - if (requiredBooleanGroup != null) localVarHeaderParams.add("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); - if (booleanGroup != null) - localVarHeaderParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + if (booleanGroup != null) { + localVarHeaderParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -904,7 +899,7 @@ public ResponseEntity testGroupParametersWithHttpInfo(@javax.annotation.No String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * test inline additionalProperties @@ -926,7 +921,6 @@ public void testInlineAdditionalProperties(@javax.annotation.Nonnull Map testInlineAdditionalPropertiesWithHttpInfo(@javax.annotation.Nonnull Map requestBody) throws RestClientException { - Object localVarPostBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { @@ -934,10 +928,10 @@ public ResponseEntity testInlineAdditionalPropertiesWithHttpInfo(@javax.an } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -949,7 +943,7 @@ public ResponseEntity testInlineAdditionalPropertiesWithHttpInfo(@javax.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, requestBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * test inline free-form additionalProperties @@ -971,7 +965,6 @@ public void testInlineFreeformAdditionalProperties(@javax.annotation.Nonnull Tes * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testInlineFreeformAdditionalPropertiesWithHttpInfo(@javax.annotation.Nonnull TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest) throws RestClientException { - Object localVarPostBody = testInlineFreeformAdditionalPropertiesRequest; // verify the required parameter 'testInlineFreeformAdditionalPropertiesRequest' is set if (testInlineFreeformAdditionalPropertiesRequest == null) { @@ -979,10 +972,10 @@ public ResponseEntity testInlineFreeformAdditionalPropertiesWithHttpInfo(@ } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -994,7 +987,7 @@ public ResponseEntity testInlineFreeformAdditionalPropertiesWithHttpInfo(@ String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, testInlineFreeformAdditionalPropertiesRequest, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * test json serialization of form data @@ -1018,7 +1011,6 @@ public void testJsonFormData(@javax.annotation.Nonnull String param, @javax.anno * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testJsonFormDataWithHttpInfo(@javax.annotation.Nonnull String param, @javax.annotation.Nonnull String param2) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'param' is set if (param == null) { @@ -1031,15 +1023,13 @@ public ResponseEntity testJsonFormDataWithHttpInfo(@javax.annotation.Nonnu } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (param != null) - localVarFormParams.add("param", param); - if (param2 != null) - localVarFormParams.add("param2", param2); + localVarFormParams.add("param", param); + localVarFormParams.add("param2", param2); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1051,7 +1041,7 @@ public ResponseEntity testJsonFormDataWithHttpInfo(@javax.annotation.Nonnu String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * test nullable parent property @@ -1073,7 +1063,6 @@ public void testNullable(@javax.annotation.Nonnull ChildWithNullable childWithNu * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testNullableWithHttpInfo(@javax.annotation.Nonnull ChildWithNullable childWithNullable) throws RestClientException { - Object localVarPostBody = childWithNullable; // verify the required parameter 'childWithNullable' is set if (childWithNullable == null) { @@ -1081,10 +1070,10 @@ public ResponseEntity testNullableWithHttpInfo(@javax.annotation.Nonnull C } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1096,7 +1085,7 @@ public ResponseEntity testNullableWithHttpInfo(@javax.annotation.Nonnull C String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, childWithNullable, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * @@ -1130,7 +1119,6 @@ public void testQueryParameterCollectionFormat(@javax.annotation.Nonnull List testQueryParameterCollectionFormatWithHttpInfo(@javax.annotation.Nonnull List pipe, @javax.annotation.Nonnull List ioutil, @javax.annotation.Nonnull List http, @javax.annotation.Nonnull List url, @javax.annotation.Nonnull List context, @javax.annotation.Nonnull String allowEmpty, @javax.annotation.Nullable Map language) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'pipe' is set if (pipe == null) { @@ -1163,10 +1151,10 @@ public ResponseEntity testQueryParameterCollectionFormatWithHttpInfo(@java } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("pipes".toUpperCase(Locale.ROOT)), "pipe", pipe)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil)); @@ -1185,7 +1173,7 @@ public ResponseEntity testQueryParameterCollectionFormatWithHttpInfo(@java String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * test referenced string map @@ -1207,7 +1195,6 @@ public void testStringMapReference(@javax.annotation.Nonnull Map * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testStringMapReferenceWithHttpInfo(@javax.annotation.Nonnull Map requestBody) throws RestClientException { - Object localVarPostBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { @@ -1215,10 +1202,10 @@ public ResponseEntity testStringMapReferenceWithHttpInfo(@javax.annotation } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1230,19 +1217,18 @@ public ResponseEntity testStringMapReferenceWithHttpInfo(@javax.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, requestBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1253,6 +1239,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 27296c53463c..4125b718577d 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -56,7 +56,6 @@ public Client testClassname(@javax.annotation.Nonnull Client client) throws Rest * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity testClassnameWithHttpInfo(@javax.annotation.Nonnull Client client) throws RestClientException { - Object localVarPostBody = client; // verify the required parameter 'client' is set if (client == null) { @@ -64,10 +63,10 @@ public ResponseEntity testClassnameWithHttpInfo(@javax.annotation.Nonnul } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -81,19 +80,18 @@ public ResponseEntity testClassnameWithHttpInfo(@javax.annotation.Nonnul String[] localVarAuthNames = new String[] { "api_key_query" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, Collections.emptyMap(), localVarQueryParams, client, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -106,6 +104,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { "api_key_query" }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java index 6627f9df4778..96c2c840ae5a 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java @@ -60,7 +60,6 @@ public void addPet(@javax.annotation.Nonnull Pet pet) throws RestClientException * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet) throws RestClientException { - Object localVarPostBody = pet; // verify the required parameter 'pet' is set if (pet == null) { @@ -68,10 +67,10 @@ public ResponseEntity addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -83,7 +82,7 @@ public ResponseEntity addPetWithHttpInfo(@javax.annotation.Nonnull Pet pet String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Deletes a pet @@ -109,7 +108,6 @@ public void deletePet(@javax.annotation.Nonnull Long petId, @javax.annotation.Nu * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deletePetWithHttpInfo(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String apiKey) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -117,16 +115,17 @@ public ResponseEntity deletePetWithHttpInfo(@javax.annotation.Nonnull Long } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (apiKey != null) - localVarHeaderParams.add("api_key", apiClient.parameterToString(apiKey)); + if (apiKey != null) { + localVarHeaderParams.add("api_key", apiClient.parameterToString(apiKey)); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -136,7 +135,7 @@ public ResponseEntity deletePetWithHttpInfo(@javax.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Finds Pets by status @@ -161,7 +160,6 @@ public List findPetsByStatus(@javax.annotation.Nonnull List status) * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity> findPetsByStatusWithHttpInfo(@javax.annotation.Nonnull List status) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'status' is set if (status == null) { @@ -169,10 +167,10 @@ public ResponseEntity> findPetsByStatusWithHttpInfo(@javax.annotation. } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); @@ -187,7 +185,7 @@ public ResponseEntity> findPetsByStatusWithHttpInfo(@javax.annotation. String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Finds Pets by tags @@ -216,7 +214,6 @@ public Set findPetsByTags(@javax.annotation.Nonnull Set tags) throw */ @Deprecated public ResponseEntity> findPetsByTagsWithHttpInfo(@javax.annotation.Nonnull Set tags) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'tags' is set if (tags == null) { @@ -224,10 +221,10 @@ public ResponseEntity> findPetsByTagsWithHttpInfo(@javax.annotation.Non } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); @@ -242,7 +239,7 @@ public ResponseEntity> findPetsByTagsWithHttpInfo(@javax.annotation.Non String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Find pet by ID @@ -269,7 +266,6 @@ public Pet getPetById(@javax.annotation.Nonnull Long petId) throws RestClientExc * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long petId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -277,13 +273,13 @@ public ResponseEntity getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -295,7 +291,7 @@ public ResponseEntity getPetByIdWithHttpInfo(@javax.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Update an existing pet @@ -323,7 +319,6 @@ public void updatePet(@javax.annotation.Nonnull Pet pet) throws RestClientExcept * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity updatePetWithHttpInfo(@javax.annotation.Nonnull Pet pet) throws RestClientException { - Object localVarPostBody = pet; // verify the required parameter 'pet' is set if (pet == null) { @@ -331,10 +326,10 @@ public ResponseEntity updatePetWithHttpInfo(@javax.annotation.Nonnull Pet } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -346,7 +341,7 @@ public ResponseEntity updatePetWithHttpInfo(@javax.annotation.Nonnull Pet String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, Collections.emptyMap(), localVarQueryParams, pet, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Updates a pet in the store with form data @@ -374,7 +369,6 @@ public void updatePetWithForm(@javax.annotation.Nonnull Long petId, @javax.annot * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity updatePetWithFormWithHttpInfo(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String name, @javax.annotation.Nullable String status) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -382,18 +376,20 @@ public ResponseEntity updatePetWithFormWithHttpInfo(@javax.annotation.Nonn } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (name != null) + if (name != null) { localVarFormParams.add("name", name); - if (status != null) + } + if (status != null) { localVarFormParams.add("status", status); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -405,7 +401,7 @@ public ResponseEntity updatePetWithFormWithHttpInfo(@javax.annotation.Nonn String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * uploads an image @@ -432,7 +428,6 @@ public ModelApiResponse uploadFile(@javax.annotation.Nonnull Long petId, @javax. * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity uploadFileWithHttpInfo(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String additionalMetadata, @javax.annotation.Nullable File _file) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -440,18 +435,20 @@ public ResponseEntity uploadFileWithHttpInfo(@javax.annotation } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { localVarFormParams.add("additionalMetadata", additionalMetadata); - if (_file != null) + } + if (_file != null) { localVarFormParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { "application/json" @@ -465,7 +462,7 @@ public ResponseEntity uploadFileWithHttpInfo(@javax.annotation String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * uploads an image (required) @@ -492,7 +489,6 @@ public ModelApiResponse uploadFileWithRequiredFile(@javax.annotation.Nonnull Lon * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity uploadFileWithRequiredFileWithHttpInfo(@javax.annotation.Nonnull Long petId, @javax.annotation.Nonnull File requiredFile, @javax.annotation.Nullable String additionalMetadata) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'petId' is set if (petId == null) { @@ -505,18 +501,18 @@ public ResponseEntity uploadFileWithRequiredFileWithHttpInfo(@ } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { localVarFormParams.add("additionalMetadata", additionalMetadata); - if (requiredFile != null) - localVarFormParams.add("requiredFile", new FileSystemResource(requiredFile)); + } + localVarFormParams.add("requiredFile", new FileSystemResource(requiredFile)); final String[] localVarAccepts = { "application/json" @@ -530,19 +526,18 @@ public ResponseEntity uploadFileWithRequiredFileWithHttpInfo(@ String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -555,6 +550,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { "petstore_auth" }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java index e96c855cbf3e..6d48da6d062e 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java @@ -57,7 +57,6 @@ public void deleteOrder(@javax.annotation.Nonnull String orderId) throws RestCli * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deleteOrderWithHttpInfo(@javax.annotation.Nonnull String orderId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { @@ -65,13 +64,13 @@ public ResponseEntity deleteOrderWithHttpInfo(@javax.annotation.Nonnull St } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("order_id", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -81,7 +80,7 @@ public ResponseEntity deleteOrderWithHttpInfo(@javax.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Returns pet inventories by status @@ -102,13 +101,12 @@ public Map getInventory() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity> getInventoryWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -120,7 +118,7 @@ public ResponseEntity> getInventoryWithHttpInfo() throws Re String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Find purchase order by ID @@ -147,7 +145,6 @@ public Order getOrderById(@javax.annotation.Nonnull Long orderId) throws RestCli * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getOrderByIdWithHttpInfo(@javax.annotation.Nonnull Long orderId) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { @@ -155,13 +152,13 @@ public ResponseEntity getOrderByIdWithHttpInfo(@javax.annotation.Nonnull } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("order_id", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -173,7 +170,7 @@ public ResponseEntity getOrderByIdWithHttpInfo(@javax.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Place an order for a pet @@ -198,7 +195,6 @@ public Order placeOrder(@javax.annotation.Nonnull Order order) throws RestClient * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity placeOrderWithHttpInfo(@javax.annotation.Nonnull Order order) throws RestClientException { - Object localVarPostBody = order; // verify the required parameter 'order' is set if (order == null) { @@ -206,10 +202,10 @@ public ResponseEntity placeOrderWithHttpInfo(@javax.annotation.Nonnull Or } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -223,19 +219,18 @@ public ResponseEntity placeOrderWithHttpInfo(@javax.annotation.Nonnull Or String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, order, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -248,6 +243,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java index da5e14fb14ad..654dcd56716f 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java @@ -56,7 +56,6 @@ public void createUser(@javax.annotation.Nonnull User user) throws RestClientExc * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUserWithHttpInfo(@javax.annotation.Nonnull User user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -64,10 +63,10 @@ public ResponseEntity createUserWithHttpInfo(@javax.annotation.Nonnull Use } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -79,7 +78,7 @@ public ResponseEntity createUserWithHttpInfo(@javax.annotation.Nonnull Use String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Creates list of users with given input array @@ -101,7 +100,6 @@ public void createUsersWithArrayInput(@javax.annotation.Nonnull List user) * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@javax.annotation.Nonnull List user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -109,10 +107,10 @@ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@javax.annotat } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -124,7 +122,7 @@ public ResponseEntity createUsersWithArrayInputWithHttpInfo(@javax.annotat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Creates list of users with given input array @@ -146,7 +144,6 @@ public void createUsersWithListInput(@javax.annotation.Nonnull List user) * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity createUsersWithListInputWithHttpInfo(@javax.annotation.Nonnull List user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'user' is set if (user == null) { @@ -154,10 +151,10 @@ public ResponseEntity createUsersWithListInputWithHttpInfo(@javax.annotati } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -169,7 +166,7 @@ public ResponseEntity createUsersWithListInputWithHttpInfo(@javax.annotati String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, Collections.emptyMap(), localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Delete user @@ -193,7 +190,6 @@ public void deleteUser(@javax.annotation.Nonnull String username) throws RestCli * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity deleteUserWithHttpInfo(@javax.annotation.Nonnull String username) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -201,13 +197,13 @@ public ResponseEntity deleteUserWithHttpInfo(@javax.annotation.Nonnull Str } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -217,7 +213,7 @@ public ResponseEntity deleteUserWithHttpInfo(@javax.annotation.Nonnull Str String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Get user by user name @@ -244,7 +240,6 @@ public User getUserByName(@javax.annotation.Nonnull String username) throws Rest * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity getUserByNameWithHttpInfo(@javax.annotation.Nonnull String username) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -252,13 +247,13 @@ public ResponseEntity getUserByNameWithHttpInfo(@javax.annotation.Nonnull } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -270,7 +265,7 @@ public ResponseEntity getUserByNameWithHttpInfo(@javax.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, uriVariables, localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Logs user into the system @@ -297,7 +292,6 @@ public String loginUser(@javax.annotation.Nonnull String username, @javax.annota * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity loginUserWithHttpInfo(@javax.annotation.Nonnull String username, @javax.annotation.Nonnull String password) throws RestClientException { - Object localVarPostBody = null; // verify the required parameter 'username' is set if (username == null) { @@ -310,10 +304,10 @@ public ResponseEntity loginUserWithHttpInfo(@javax.annotation.Nonnull St } - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); @@ -329,7 +323,7 @@ public ResponseEntity loginUserWithHttpInfo(@javax.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Logs out current logged in user session @@ -349,13 +343,12 @@ public void logoutUser() throws RestClientException { * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity logoutUserWithHttpInfo() throws RestClientException { - Object localVarPostBody = null; - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -365,7 +358,7 @@ public ResponseEntity logoutUserWithHttpInfo() throws RestClientException String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, Collections.emptyMap(), localVarQueryParams, null, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } /** * Updated user @@ -391,7 +384,6 @@ public void updateUser(@javax.annotation.Nonnull String username, @javax.annotat * @throws RestClientException if an error occurs while attempting to invoke the API */ public ResponseEntity updateUserWithHttpInfo(@javax.annotation.Nonnull String username, @javax.annotation.Nonnull User user) throws RestClientException { - Object localVarPostBody = user; // verify the required parameter 'username' is set if (username == null) { @@ -404,13 +396,13 @@ public ResponseEntity updateUserWithHttpInfo(@javax.annotation.Nonnull Str } // create path and map variables - final Map uriVariables = new HashMap(); + final Map uriVariables = new HashMap<>(); uriVariables.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -422,19 +414,18 @@ public ResponseEntity updateUserWithHttpInfo(@javax.annotation.Nonnull Str String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, uriVariables, localVarQueryParams, user, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localReturnType); } @Override public ResponseEntity invokeAPI(String url, HttpMethod method, Object request, ParameterizedTypeReference returnType) throws RestClientException { String localVarPath = url.replace(apiClient.getBasePath(), ""); - Object localVarPostBody = request; - final Map uriVariables = new HashMap(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final Map uriVariables = new HashMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders localVarHeaderParams = new HttpHeaders(); - final MultiValueMap localVarCookieParams = new LinkedMultiValueMap(); - final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); + final MultiValueMap localVarCookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarFormParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -445,6 +436,6 @@ public ResponseEntity invokeAPI(String url, HttpMethod method, Object req String[] localVarAuthNames = new String[] { }; - return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); + return apiClient.invokeAPI(localVarPath, method, uriVariables, localVarQueryParams, request, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, returnType); } } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 0f3a7bba75ba..a26d842378e6 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -55,18 +55,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.Nonnull Client client) throws WebClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new WebClientResponseException("Missing the required parameter 'client' when calling call123testSpecialTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -79,8 +78,8 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -92,7 +91,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono call123testSpecialTags(@jakarta.annotation.Nonnull Client client) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return call123testSpecialTagsRequestCreation(client).bodyToMono(localVarReturnType); } @@ -105,7 +104,7 @@ public Mono call123testSpecialTags(@jakarta.annotation.Nonnull Client cl * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> call123testSpecialTagsWithHttpInfo(@jakarta.annotation.Nonnull Client client) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return call123testSpecialTagsRequestCreation(client).toEntity(localVarReturnType); } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/DefaultApi.java index e39ee37a93b4..be2d3f92377a 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -54,14 +54,13 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -72,8 +71,8 @@ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -84,7 +83,7 @@ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono fooGet() throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fooGetRequestCreation().bodyToMono(localVarReturnType); } @@ -96,7 +95,7 @@ public Mono fooGet() throws WebClientResponseException { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> fooGetWithHttpInfo() throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fooGetRequestCreation().toEntity(localVarReturnType); } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java index 64f9c8c28487..9f8e8c5cc99b 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java @@ -68,14 +68,13 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -86,8 +85,8 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponse String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -98,7 +97,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponse * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono fakeBigDecimalMap() throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakeBigDecimalMapRequestCreation().bodyToMono(localVarReturnType); } @@ -110,7 +109,7 @@ public Mono fakeBigDecimalMap() throws WebClientRe * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> fakeBigDecimalMapWithHttpInfo() throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakeBigDecimalMapRequestCreation().toEntity(localVarReturnType); } @@ -133,14 +132,13 @@ public ResponseSpec fakeBigDecimalMapWithResponseSpec() throws WebClientResponse * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -151,8 +149,8 @@ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseExce String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -163,7 +161,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseExce * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono fakeHealthGet() throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakeHealthGetRequestCreation().bodyToMono(localVarReturnType); } @@ -175,7 +173,7 @@ public Mono fakeHealthGet() throws WebClientResponseException * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> fakeHealthGetWithHttpInfo() throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakeHealthGetRequestCreation().toEntity(localVarReturnType); } @@ -200,23 +198,24 @@ public ResponseSpec fakeHealthGetWithResponseSpec() throws WebClientResponseExce * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.Nonnull Pet pet, @jakarta.annotation.Nullable String query1, @jakarta.annotation.Nullable String header1) throws WebClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new WebClientResponseException("Missing the required parameter 'pet' when calling fakeHttpSignatureTest", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); - if (header1 != null) - headerParams.add("header_1", apiClient.parameterToString(header1)); + if (header1 != null) { + headerParams.add("header_1", apiClient.parameterToString(header1)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { @@ -226,8 +225,8 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No String[] localVarAuthNames = new String[] { "http_signature_test" }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -240,7 +239,7 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono fakeHttpSignatureTest(@jakarta.annotation.Nonnull Pet pet, @jakarta.annotation.Nullable String query1, @jakarta.annotation.Nullable String header1) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakeHttpSignatureTestRequestCreation(pet, query1, header1).bodyToMono(localVarReturnType); } @@ -254,7 +253,7 @@ public Mono fakeHttpSignatureTest(@jakarta.annotation.Nonnull Pet pet, @ja * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> fakeHttpSignatureTestWithHttpInfo(@jakarta.annotation.Nonnull Pet pet, @jakarta.annotation.Nullable String query1, @jakarta.annotation.Nullable String header1) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakeHttpSignatureTestRequestCreation(pet, query1, header1).toEntity(localVarReturnType); } @@ -281,14 +280,13 @@ public ResponseSpec fakeHttpSignatureTestWithResponseSpec(@jakarta.annotation.No * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotation.Nullable Boolean body) throws WebClientResponseException { - Object postBody = body; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -301,8 +299,8 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -314,7 +312,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono fakeOuterBooleanSerialize(@jakarta.annotation.Nullable Boolean body) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakeOuterBooleanSerializeRequestCreation(body).bodyToMono(localVarReturnType); } @@ -327,7 +325,7 @@ public Mono fakeOuterBooleanSerialize(@jakarta.annotation.Nullable Bool * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> fakeOuterBooleanSerializeWithHttpInfo(@jakarta.annotation.Nullable Boolean body) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakeOuterBooleanSerializeRequestCreation(body).toEntity(localVarReturnType); } @@ -352,14 +350,13 @@ public ResponseSpec fakeOuterBooleanSerializeWithResponseSpec(@jakarta.annotatio * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotation.Nullable OuterComposite outerComposite) throws WebClientResponseException { - Object postBody = outerComposite; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -372,8 +369,8 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, outerComposite, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -385,7 +382,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono fakeOuterCompositeSerialize(@jakarta.annotation.Nullable OuterComposite outerComposite) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakeOuterCompositeSerializeRequestCreation(outerComposite).bodyToMono(localVarReturnType); } @@ -398,7 +395,7 @@ public Mono fakeOuterCompositeSerialize(@jakarta.annotation.Null * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> fakeOuterCompositeSerializeWithHttpInfo(@jakarta.annotation.Nullable OuterComposite outerComposite) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakeOuterCompositeSerializeRequestCreation(outerComposite).toEntity(localVarReturnType); } @@ -423,14 +420,13 @@ public ResponseSpec fakeOuterCompositeSerializeWithResponseSpec(@jakarta.annotat * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation.Nullable BigDecimal body) throws WebClientResponseException { - Object postBody = body; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -443,8 +439,8 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -456,7 +452,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono fakeOuterNumberSerialize(@jakarta.annotation.Nullable BigDecimal body) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakeOuterNumberSerializeRequestCreation(body).bodyToMono(localVarReturnType); } @@ -469,7 +465,7 @@ public Mono fakeOuterNumberSerialize(@jakarta.annotation.Nullable Bi * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> fakeOuterNumberSerializeWithHttpInfo(@jakarta.annotation.Nullable BigDecimal body) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakeOuterNumberSerializeRequestCreation(body).toEntity(localVarReturnType); } @@ -494,14 +490,13 @@ public ResponseSpec fakeOuterNumberSerializeWithResponseSpec(@jakarta.annotation * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation.Nullable String body) throws WebClientResponseException { - Object postBody = body; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -514,8 +509,8 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -527,7 +522,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono fakeOuterStringSerialize(@jakarta.annotation.Nullable String body) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakeOuterStringSerializeRequestCreation(body).bodyToMono(localVarReturnType); } @@ -540,7 +535,7 @@ public Mono fakeOuterStringSerialize(@jakarta.annotation.Nullable String * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> fakeOuterStringSerializeWithHttpInfo(@jakarta.annotation.Nullable String body) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakeOuterStringSerializeRequestCreation(body).toEntity(localVarReturnType); } @@ -565,18 +560,17 @@ public ResponseSpec fakeOuterStringSerializeWithResponseSpec(@jakarta.annotation * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.annotation.Nonnull OuterObjectWithEnumProperty outerObjectWithEnumProperty) throws WebClientResponseException { - Object postBody = outerObjectWithEnumProperty; // verify the required parameter 'outerObjectWithEnumProperty' is set if (outerObjectWithEnumProperty == null) { throw new WebClientResponseException("Missing the required parameter 'outerObjectWithEnumProperty' when calling fakePropertyEnumIntegerSerialize", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -589,8 +583,8 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, outerObjectWithEnumProperty, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -602,7 +596,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono fakePropertyEnumIntegerSerialize(@jakarta.annotation.Nonnull OuterObjectWithEnumProperty outerObjectWithEnumProperty) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakePropertyEnumIntegerSerializeRequestCreation(outerObjectWithEnumProperty).bodyToMono(localVarReturnType); } @@ -615,7 +609,7 @@ public Mono fakePropertyEnumIntegerSerialize(@jakar * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> fakePropertyEnumIntegerSerializeWithHttpInfo(@jakarta.annotation.Nonnull OuterObjectWithEnumProperty outerObjectWithEnumProperty) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fakePropertyEnumIntegerSerializeRequestCreation(outerObjectWithEnumProperty).toEntity(localVarReturnType); } @@ -639,18 +633,17 @@ public ResponseSpec fakePropertyEnumIntegerSerializeWithResponseSpec(@jakarta.an * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws WebClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new WebClientResponseException("Missing the required parameter 'requestBody' when calling testAdditionalPropertiesReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -661,8 +654,8 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -673,7 +666,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testAdditionalPropertiesReference(@jakarta.annotation.Nonnull Map requestBody) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testAdditionalPropertiesReferenceRequestCreation(requestBody).bodyToMono(localVarReturnType); } @@ -685,7 +678,7 @@ public Mono testAdditionalPropertiesReference(@jakarta.annotation.Nonnull * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testAdditionalPropertiesReferenceWithHttpInfo(@jakarta.annotation.Nonnull Map requestBody) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testAdditionalPropertiesReferenceRequestCreation(requestBody).toEntity(localVarReturnType); } @@ -709,18 +702,17 @@ public ResponseSpec testAdditionalPropertiesReferenceWithResponseSpec(@jakarta.a * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nullable File body) throws WebClientResponseException { - Object postBody = body; // verify the required parameter 'body' is set if (body == null) { throw new WebClientResponseException("Missing the required parameter 'body' when calling testBodyWithBinary", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -731,8 +723,8 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -743,7 +735,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nulla * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testBodyWithBinary(@jakarta.annotation.Nullable File body) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testBodyWithBinaryRequestCreation(body).bodyToMono(localVarReturnType); } @@ -755,7 +747,7 @@ public Mono testBodyWithBinary(@jakarta.annotation.Nullable File body) thr * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testBodyWithBinaryWithHttpInfo(@jakarta.annotation.Nullable File body) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testBodyWithBinaryRequestCreation(body).toEntity(localVarReturnType); } @@ -779,18 +771,17 @@ public ResponseSpec testBodyWithBinaryWithResponseSpec(@jakarta.annotation.Nulla * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.Nonnull FileSchemaTestClass fileSchemaTestClass) throws WebClientResponseException { - Object postBody = fileSchemaTestClass; // verify the required parameter 'fileSchemaTestClass' is set if (fileSchemaTestClass == null) { throw new WebClientResponseException("Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -801,8 +792,8 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, fileSchemaTestClass, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -813,7 +804,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testBodyWithFileSchema(@jakarta.annotation.Nonnull FileSchemaTestClass fileSchemaTestClass) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testBodyWithFileSchemaRequestCreation(fileSchemaTestClass).bodyToMono(localVarReturnType); } @@ -825,7 +816,7 @@ public Mono testBodyWithFileSchema(@jakarta.annotation.Nonnull FileSchemaT * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testBodyWithFileSchemaWithHttpInfo(@jakarta.annotation.Nonnull FileSchemaTestClass fileSchemaTestClass) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testBodyWithFileSchemaRequestCreation(fileSchemaTestClass).toEntity(localVarReturnType); } @@ -850,7 +841,6 @@ public ResponseSpec testBodyWithFileSchemaWithResponseSpec(@jakarta.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation.Nonnull String query, @jakarta.annotation.Nonnull User user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'query' is set if (query == null) { throw new WebClientResponseException("Missing the required parameter 'query' when calling testBodyWithQueryParams", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -860,12 +850,12 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation. throw new WebClientResponseException("Missing the required parameter 'user' when calling testBodyWithQueryParams", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); @@ -878,8 +868,8 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation. String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -891,7 +881,7 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation. * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testBodyWithQueryParams(@jakarta.annotation.Nonnull String query, @jakarta.annotation.Nonnull User user) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testBodyWithQueryParamsRequestCreation(query, user).bodyToMono(localVarReturnType); } @@ -904,7 +894,7 @@ public Mono testBodyWithQueryParams(@jakarta.annotation.Nonnull String que * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testBodyWithQueryParamsWithHttpInfo(@jakarta.annotation.Nonnull String query, @jakarta.annotation.Nonnull User user) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testBodyWithQueryParamsRequestCreation(query, user).toEntity(localVarReturnType); } @@ -930,18 +920,17 @@ public ResponseSpec testBodyWithQueryParamsWithResponseSpec(@jakarta.annotation. * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull Client client) throws WebClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new WebClientResponseException("Missing the required parameter 'client' when calling testClientModel", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -954,8 +943,8 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -967,7 +956,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testClientModel(@jakarta.annotation.Nonnull Client client) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testClientModelRequestCreation(client).bodyToMono(localVarReturnType); } @@ -980,7 +969,7 @@ public Mono testClientModel(@jakarta.annotation.Nonnull Client client) t * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testClientModelWithHttpInfo(@jakarta.annotation.Nonnull Client client) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testClientModelRequestCreation(client).toEntity(localVarReturnType); } @@ -1018,7 +1007,6 @@ public ResponseSpec testClientModelWithResponseSpec(@jakarta.annotation.Nonnull * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.Nonnull BigDecimal number, @jakarta.annotation.Nonnull Double _double, @jakarta.annotation.Nonnull String patternWithoutDelimiter, @jakarta.annotation.Nonnull byte[] _byte, @jakarta.annotation.Nullable Integer integer, @jakarta.annotation.Nullable Integer int32, @jakarta.annotation.Nullable Long int64, @jakarta.annotation.Nullable Float _float, @jakarta.annotation.Nullable String string, @jakarta.annotation.Nullable File binary, @jakarta.annotation.Nullable LocalDate date, @jakarta.annotation.Nullable OffsetDateTime dateTime, @jakarta.annotation.Nullable String password, @jakarta.annotation.Nullable String paramCallback) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'number' is set if (number == null) { throw new WebClientResponseException("Missing the required parameter 'number' when calling testEndpointParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1036,41 +1024,47 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N throw new WebClientResponseException("Missing the required parameter '_byte' when calling testEndpointParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (integer != null) + if (integer != null) { formParams.add("integer", integer); - if (int32 != null) + } + if (int32 != null) { formParams.add("int32", int32); - if (int64 != null) + } + if (int64 != null) { formParams.add("int64", int64); - if (number != null) - formParams.add("number", number); - if (_float != null) + } + formParams.add("number", number); + if (_float != null) { formParams.add("float", _float); - if (_double != null) - formParams.add("double", _double); - if (string != null) + } + formParams.add("double", _double); + if (string != null) { formParams.add("string", string); - if (patternWithoutDelimiter != null) - formParams.add("pattern_without_delimiter", patternWithoutDelimiter); - if (_byte != null) - formParams.add("byte", _byte); - if (binary != null) + } + formParams.add("pattern_without_delimiter", patternWithoutDelimiter); + formParams.add("byte", _byte); + if (binary != null) { formParams.add("binary", new FileSystemResource(binary)); - if (date != null) + } + if (date != null) { formParams.add("date", date); - if (dateTime != null) + } + if (dateTime != null) { formParams.add("dateTime", dateTime); - if (password != null) + } + if (password != null) { formParams.add("password", password); - if (paramCallback != null) + } + if (paramCallback != null) { formParams.add("callback", paramCallback); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1081,8 +1075,8 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { "http_basic_test" }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1107,7 +1101,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testEndpointParameters(@jakarta.annotation.Nonnull BigDecimal number, @jakarta.annotation.Nonnull Double _double, @jakarta.annotation.Nonnull String patternWithoutDelimiter, @jakarta.annotation.Nonnull byte[] _byte, @jakarta.annotation.Nullable Integer integer, @jakarta.annotation.Nullable Integer int32, @jakarta.annotation.Nullable Long int64, @jakarta.annotation.Nullable Float _float, @jakarta.annotation.Nullable String string, @jakarta.annotation.Nullable File binary, @jakarta.annotation.Nullable LocalDate date, @jakarta.annotation.Nullable OffsetDateTime dateTime, @jakarta.annotation.Nullable String password, @jakarta.annotation.Nullable String paramCallback) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).bodyToMono(localVarReturnType); } @@ -1133,7 +1127,7 @@ public Mono testEndpointParameters(@jakarta.annotation.Nonnull BigDecimal * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testEndpointParametersWithHttpInfo(@jakarta.annotation.Nonnull BigDecimal number, @jakarta.annotation.Nonnull Double _double, @jakarta.annotation.Nonnull String patternWithoutDelimiter, @jakarta.annotation.Nonnull byte[] _byte, @jakarta.annotation.Nullable Integer integer, @jakarta.annotation.Nullable Integer int32, @jakarta.annotation.Nullable Long int64, @jakarta.annotation.Nullable Float _float, @jakarta.annotation.Nullable String string, @jakarta.annotation.Nullable File binary, @jakarta.annotation.Nullable LocalDate date, @jakarta.annotation.Nullable OffsetDateTime dateTime, @jakarta.annotation.Nullable String password, @jakarta.annotation.Nullable String paramCallback) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).toEntity(localVarReturnType); } @@ -1180,14 +1174,13 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@jakarta.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString)); @@ -1195,14 +1188,19 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); - if (enumHeaderStringArray != null) - headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); - if (enumHeaderString != null) - headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); - if (enumFormStringArray != null) + if (enumHeaderStringArray != null) { + headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); + } + if (enumHeaderString != null) { + headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + } + + if (enumFormStringArray != null) { formParams.addAll("enum_form_string_array", enumFormStringArray); - if (enumFormString != null) + } + if (enumFormString != null) { formParams.add("enum_form_string", enumFormString); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1213,8 +1211,8 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1234,7 +1232,7 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testEnumParameters(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).bodyToMono(localVarReturnType); } @@ -1255,7 +1253,7 @@ public Mono testEnumParameters(@jakarta.annotation.Nullable List e * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType); } @@ -1293,7 +1291,6 @@ public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nulla * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonnull Integer requiredStringGroup, @jakarta.annotation.Nonnull Boolean requiredBooleanGroup, @jakarta.annotation.Nonnull Long requiredInt64Group, @jakarta.annotation.Nullable Integer stringGroup, @jakarta.annotation.Nullable Boolean booleanGroup, @jakarta.annotation.Nullable Long int64Group) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'requiredStringGroup' is set if (requiredStringGroup == null) { throw new WebClientResponseException("Missing the required parameter 'requiredStringGroup' when calling testGroupParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1307,22 +1304,23 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn throw new WebClientResponseException("Missing the required parameter 'requiredInt64Group' when calling testGroupParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); - if (requiredBooleanGroup != null) headerParams.add("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); - if (booleanGroup != null) - headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + if (booleanGroup != null) { + headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -1330,8 +1328,8 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn String[] localVarAuthNames = new String[] { "bearer_test" }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1347,7 +1345,7 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testGroupParameters(@jakarta.annotation.Nonnull Integer requiredStringGroup, @jakarta.annotation.Nonnull Boolean requiredBooleanGroup, @jakarta.annotation.Nonnull Long requiredInt64Group, @jakarta.annotation.Nullable Integer stringGroup, @jakarta.annotation.Nullable Boolean booleanGroup, @jakarta.annotation.Nullable Long int64Group) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testGroupParametersRequestCreation(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group).bodyToMono(localVarReturnType); } @@ -1364,7 +1362,7 @@ public Mono testGroupParameters(@jakarta.annotation.Nonnull Integer requir * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testGroupParametersWithHttpInfo(@jakarta.annotation.Nonnull Integer requiredStringGroup, @jakarta.annotation.Nonnull Boolean requiredBooleanGroup, @jakarta.annotation.Nonnull Long requiredInt64Group, @jakarta.annotation.Nullable Integer stringGroup, @jakarta.annotation.Nullable Boolean booleanGroup, @jakarta.annotation.Nullable Long int64Group) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testGroupParametersRequestCreation(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group).toEntity(localVarReturnType); } @@ -1393,18 +1391,17 @@ public ResponseSpec testGroupParametersWithResponseSpec(@jakarta.annotation.Nonn * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws WebClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new WebClientResponseException("Missing the required parameter 'requestBody' when calling testInlineAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1415,8 +1412,8 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1427,7 +1424,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testInlineAdditionalProperties(@jakarta.annotation.Nonnull Map requestBody) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testInlineAdditionalPropertiesRequestCreation(requestBody).bodyToMono(localVarReturnType); } @@ -1439,7 +1436,7 @@ public Mono testInlineAdditionalProperties(@jakarta.annotation.Nonnull Map * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testInlineAdditionalPropertiesWithHttpInfo(@jakarta.annotation.Nonnull Map requestBody) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testInlineAdditionalPropertiesRequestCreation(requestBody).toEntity(localVarReturnType); } @@ -1463,18 +1460,17 @@ public ResponseSpec testInlineAdditionalPropertiesWithResponseSpec(@jakarta.anno * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jakarta.annotation.Nonnull TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest) throws WebClientResponseException { - Object postBody = testInlineFreeformAdditionalPropertiesRequest; // verify the required parameter 'testInlineFreeformAdditionalPropertiesRequest' is set if (testInlineFreeformAdditionalPropertiesRequest == null) { throw new WebClientResponseException("Missing the required parameter 'testInlineFreeformAdditionalPropertiesRequest' when calling testInlineFreeformAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1485,8 +1481,8 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, testInlineFreeformAdditionalPropertiesRequest, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1497,7 +1493,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testInlineFreeformAdditionalProperties(@jakarta.annotation.Nonnull TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testInlineFreeformAdditionalPropertiesRequestCreation(testInlineFreeformAdditionalPropertiesRequest).bodyToMono(localVarReturnType); } @@ -1509,7 +1505,7 @@ public Mono testInlineFreeformAdditionalProperties(@jakarta.annotation.Non * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testInlineFreeformAdditionalPropertiesWithHttpInfo(@jakarta.annotation.Nonnull TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testInlineFreeformAdditionalPropertiesRequestCreation(testInlineFreeformAdditionalPropertiesRequest).toEntity(localVarReturnType); } @@ -1534,7 +1530,6 @@ public ResponseSpec testInlineFreeformAdditionalPropertiesWithResponseSpec(@jaka * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String param, @jakarta.annotation.Nonnull String param2) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'param' is set if (param == null) { throw new WebClientResponseException("Missing the required parameter 'param' when calling testJsonFormData", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1544,17 +1539,15 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull throw new WebClientResponseException("Missing the required parameter 'param2' when calling testJsonFormData", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (param != null) - formParams.add("param", param); - if (param2 != null) - formParams.add("param2", param2); + formParams.add("param", param); + formParams.add("param2", param2); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1565,8 +1558,8 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1578,7 +1571,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testJsonFormData(@jakarta.annotation.Nonnull String param, @jakarta.annotation.Nonnull String param2) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testJsonFormDataRequestCreation(param, param2).bodyToMono(localVarReturnType); } @@ -1591,7 +1584,7 @@ public Mono testJsonFormData(@jakarta.annotation.Nonnull String param, @ja * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testJsonFormDataWithHttpInfo(@jakarta.annotation.Nonnull String param, @jakarta.annotation.Nonnull String param2) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testJsonFormDataRequestCreation(param, param2).toEntity(localVarReturnType); } @@ -1616,18 +1609,17 @@ public ResponseSpec testJsonFormDataWithResponseSpec(@jakarta.annotation.Nonnull * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull ChildWithNullable childWithNullable) throws WebClientResponseException { - Object postBody = childWithNullable; // verify the required parameter 'childWithNullable' is set if (childWithNullable == null) { throw new WebClientResponseException("Missing the required parameter 'childWithNullable' when calling testNullable", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1638,8 +1630,8 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, childWithNullable, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1650,7 +1642,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testNullable(@jakarta.annotation.Nonnull ChildWithNullable childWithNullable) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testNullableRequestCreation(childWithNullable).bodyToMono(localVarReturnType); } @@ -1662,7 +1654,7 @@ public Mono testNullable(@jakarta.annotation.Nonnull ChildWithNullable chi * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testNullableWithHttpInfo(@jakarta.annotation.Nonnull ChildWithNullable childWithNullable) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testNullableRequestCreation(childWithNullable).toEntity(localVarReturnType); } @@ -1692,7 +1684,6 @@ public ResponseSpec testNullableWithResponseSpec(@jakarta.annotation.Nonnull Chi * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta.annotation.Nonnull List pipe, @jakarta.annotation.Nonnull List ioutil, @jakarta.annotation.Nonnull List http, @jakarta.annotation.Nonnull List url, @jakarta.annotation.Nonnull List context, @jakarta.annotation.Nonnull String allowEmpty, @jakarta.annotation.Nullable Map language) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'pipe' is set if (pipe == null) { throw new WebClientResponseException("Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1718,12 +1709,12 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. throw new WebClientResponseException("Missing the required parameter 'allowEmpty' when calling testQueryParameterCollectionFormat", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("pipes".toUpperCase(Locale.ROOT)), "pipe", pipe)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil)); @@ -1740,8 +1731,8 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1758,7 +1749,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testQueryParameterCollectionFormat(@jakarta.annotation.Nonnull List pipe, @jakarta.annotation.Nonnull List ioutil, @jakarta.annotation.Nonnull List http, @jakarta.annotation.Nonnull List url, @jakarta.annotation.Nonnull List context, @jakarta.annotation.Nonnull String allowEmpty, @jakarta.annotation.Nullable Map language) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testQueryParameterCollectionFormatRequestCreation(pipe, ioutil, http, url, context, allowEmpty, language).bodyToMono(localVarReturnType); } @@ -1776,7 +1767,7 @@ public Mono testQueryParameterCollectionFormat(@jakarta.annotation.Nonnull * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testQueryParameterCollectionFormatWithHttpInfo(@jakarta.annotation.Nonnull List pipe, @jakarta.annotation.Nonnull List ioutil, @jakarta.annotation.Nonnull List http, @jakarta.annotation.Nonnull List url, @jakarta.annotation.Nonnull List context, @jakarta.annotation.Nonnull String allowEmpty, @jakarta.annotation.Nullable Map language) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testQueryParameterCollectionFormatRequestCreation(pipe, ioutil, http, url, context, allowEmpty, language).toEntity(localVarReturnType); } @@ -1806,18 +1797,17 @@ public ResponseSpec testQueryParameterCollectionFormatWithResponseSpec(@jakarta. * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.Nonnull Map requestBody) throws WebClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new WebClientResponseException("Missing the required parameter 'requestBody' when calling testStringMapReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1828,8 +1818,8 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1840,7 +1830,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testStringMapReference(@jakarta.annotation.Nonnull Map requestBody) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testStringMapReferenceRequestCreation(requestBody).bodyToMono(localVarReturnType); } @@ -1852,7 +1842,7 @@ public Mono testStringMapReference(@jakarta.annotation.Nonnull Map> testStringMapReferenceWithHttpInfo(@jakarta.annotation.Nonnull Map requestBody) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testStringMapReferenceRequestCreation(requestBody).toEntity(localVarReturnType); } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index c22e8b9b7933..3c79afd35554 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -55,18 +55,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Client client) throws WebClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new WebClientResponseException("Missing the required parameter 'client' when calling testClassname", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -79,8 +78,8 @@ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Cl String[] localVarAuthNames = new String[] { "api_key_query" }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -92,7 +91,7 @@ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Cl * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testClassname(@jakarta.annotation.Nonnull Client client) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testClassnameRequestCreation(client).bodyToMono(localVarReturnType); } @@ -105,7 +104,7 @@ public Mono testClassname(@jakarta.annotation.Nonnull Client client) thr * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testClassnameWithHttpInfo(@jakarta.annotation.Nonnull Client client) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return testClassnameRequestCreation(client).toEntity(localVarReturnType); } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/PetApi.java index 43306b843cf9..acf7b1a368c5 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/PetApi.java @@ -58,18 +58,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) throws WebClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new WebClientResponseException("Missing the required parameter 'pet' when calling addPet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -80,8 +79,8 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -93,7 +92,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono addPet(@jakarta.annotation.Nonnull Pet pet) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return addPetRequestCreation(pet).bodyToMono(localVarReturnType); } @@ -106,7 +105,7 @@ public Mono addPet(@jakarta.annotation.Nonnull Pet pet) throws WebClientRe * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pet) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return addPetRequestCreation(pet).toEntity(localVarReturnType); } @@ -133,23 +132,24 @@ public ResponseSpec addPetWithResponseSpec(@jakarta.annotation.Nonnull Pet pet) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String apiKey) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling deletePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); + + if (apiKey != null) { + headerParams.add("api_key", apiClient.parameterToString(apiKey)); + } - if (apiKey != null) - headerParams.add("api_key", apiClient.parameterToString(apiKey)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -157,8 +157,8 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -171,7 +171,7 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono deletePet(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String apiKey) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return deletePetRequestCreation(petId, apiKey).bodyToMono(localVarReturnType); } @@ -185,7 +185,7 @@ public Mono deletePet(@jakarta.annotation.Nonnull Long petId, @jakarta.ann * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> deletePetWithHttpInfo(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String apiKey) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return deletePetRequestCreation(petId, apiKey).toEntity(localVarReturnType); } @@ -213,18 +213,17 @@ public ResponseSpec deletePetWithResponseSpec(@jakarta.annotation.Nonnull Long p * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull List status) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'status' is set if (status == null) { throw new WebClientResponseException("Missing the required parameter 'status' when calling findPetsByStatus", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); @@ -237,8 +236,8 @@ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -251,7 +250,7 @@ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public List findPetsByStatus(@jakarta.annotation.Nonnull List status) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return findPetsByStatusRequestCreation(status).bodyToFlux(localVarReturnType).collectList().block(); } @@ -265,7 +264,7 @@ public List findPetsByStatus(@jakarta.annotation.Nonnull List statu * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public ResponseEntity> findPetsByStatusWithHttpInfo(@jakarta.annotation.Nonnull List status) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return findPetsByStatusRequestCreation(status).toEntityList(localVarReturnType).block(); } @@ -294,18 +293,17 @@ public ResponseSpec findPetsByStatusWithResponseSpec(@jakarta.annotation.Nonnull */ @Deprecated private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull Set tags) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'tags' is set if (tags == null) { throw new WebClientResponseException("Missing the required parameter 'tags' when calling findPetsByTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); @@ -318,8 +316,8 @@ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull S String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -334,7 +332,7 @@ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull S */ @Deprecated public Set findPetsByTags(@jakarta.annotation.Nonnull Set tags) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return findPetsByTagsRequestCreation(tags).bodyToFlux(localVarReturnType).collect(Collectors.toSet()).block(); } @@ -350,7 +348,7 @@ public Set findPetsByTags(@jakarta.annotation.Nonnull Set tags) thr */ @Deprecated public ResponseEntity> findPetsByTagsWithHttpInfo(@jakarta.annotation.Nonnull Set tags) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return findPetsByTagsRequestCreation(tags).toEntityList(localVarReturnType).block(); } @@ -380,20 +378,19 @@ public ResponseSpec findPetsByTagsWithResponseSpec(@jakarta.annotation.Nonnull S * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long petId) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling getPetById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -404,8 +401,8 @@ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "api_key" }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -419,7 +416,7 @@ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Pet getPetById(@jakarta.annotation.Nonnull Long petId) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return getPetByIdRequestCreation(petId).bodyToMono(localVarReturnType).block(); } @@ -434,7 +431,7 @@ public Pet getPetById(@jakarta.annotation.Nonnull Long petId) throws WebClientRe * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public ResponseEntity getPetByIdWithHttpInfo(@jakarta.annotation.Nonnull Long petId) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return getPetByIdRequestCreation(petId).toEntity(localVarReturnType).block(); } @@ -463,18 +460,17 @@ public ResponseSpec getPetByIdWithResponseSpec(@jakarta.annotation.Nonnull Long * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pet) throws WebClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new WebClientResponseException("Missing the required parameter 'pet' when calling updatePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -485,8 +481,8 @@ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pe String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -500,7 +496,7 @@ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pe * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public void updatePet(@jakarta.annotation.Nonnull Pet pet) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; updatePetRequestCreation(pet).bodyToMono(localVarReturnType).block(); } @@ -515,7 +511,7 @@ public void updatePet(@jakarta.annotation.Nonnull Pet pet) throws WebClientRespo * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public ResponseEntity updatePetWithHttpInfo(@jakarta.annotation.Nonnull Pet pet) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return updatePetRequestCreation(pet).toEntity(localVarReturnType).block(); } @@ -545,25 +541,26 @@ public ResponseSpec updatePetWithResponseSpec(@jakarta.annotation.Nonnull Pet pe * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String name, @jakarta.annotation.Nullable String status) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling updatePetWithForm", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (name != null) + if (name != null) { formParams.add("name", name); - if (status != null) + } + if (status != null) { formParams.add("status", status); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -574,8 +571,8 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -589,7 +586,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono updatePetWithForm(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String name, @jakarta.annotation.Nullable String status) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return updatePetWithFormRequestCreation(petId, name, status).bodyToMono(localVarReturnType); } @@ -604,7 +601,7 @@ public Mono updatePetWithForm(@jakarta.annotation.Nonnull Long petId, @jak * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> updatePetWithFormWithHttpInfo(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String name, @jakarta.annotation.Nullable String status) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return updatePetWithFormRequestCreation(petId, name, status).toEntity(localVarReturnType); } @@ -634,25 +631,26 @@ public ResponseSpec updatePetWithFormWithResponseSpec(@jakarta.annotation.Nonnul * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String additionalMetadata, @jakarta.annotation.Nullable File _file) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling uploadFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (_file != null) + } + if (_file != null) { formParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { "application/json" @@ -665,8 +663,8 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -680,7 +678,7 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono uploadFile(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String additionalMetadata, @jakarta.annotation.Nullable File _file) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return uploadFileRequestCreation(petId, additionalMetadata, _file).bodyToMono(localVarReturnType); } @@ -695,7 +693,7 @@ public Mono uploadFile(@jakarta.annotation.Nonnull Long petId, * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> uploadFileWithHttpInfo(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String additionalMetadata, @jakarta.annotation.Nullable File _file) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return uploadFileRequestCreation(petId, additionalMetadata, _file).toEntity(localVarReturnType); } @@ -724,7 +722,6 @@ public ResponseSpec uploadFileWithResponseSpec(@jakarta.annotation.Nonnull Long * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nonnull File requiredFile, @jakarta.annotation.Nullable String additionalMetadata) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling uploadFileWithRequiredFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -734,19 +731,19 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati throw new WebClientResponseException("Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (requiredFile != null) - formParams.add("requiredFile", new FileSystemResource(requiredFile)); + } + formParams.add("requiredFile", new FileSystemResource(requiredFile)); final String[] localVarAccepts = { "application/json" @@ -759,8 +756,8 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -774,7 +771,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono uploadFileWithRequiredFile(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nonnull File requiredFile, @jakarta.annotation.Nullable String additionalMetadata) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return uploadFileWithRequiredFileRequestCreation(petId, requiredFile, additionalMetadata).bodyToMono(localVarReturnType); } @@ -789,7 +786,7 @@ public Mono uploadFileWithRequiredFile(@jakarta.annotation.Non * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> uploadFileWithRequiredFileWithHttpInfo(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nonnull File requiredFile, @jakarta.annotation.Nullable String additionalMetadata) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return uploadFileWithRequiredFileRequestCreation(petId, requiredFile, additionalMetadata).toEntity(localVarReturnType); } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java index efbf9e21d6a4..d43a850044cb 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java @@ -55,20 +55,19 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull String orderId) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new WebClientResponseException("Missing the required parameter 'orderId' when calling deleteOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("order_id", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -77,8 +76,8 @@ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull Stri String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -90,7 +89,7 @@ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull Stri * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono deleteOrder(@jakarta.annotation.Nonnull String orderId) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return deleteOrderRequestCreation(orderId).bodyToMono(localVarReturnType); } @@ -103,7 +102,7 @@ public Mono deleteOrder(@jakarta.annotation.Nonnull String orderId) throws * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> deleteOrderWithHttpInfo(@jakarta.annotation.Nonnull String orderId) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return deleteOrderRequestCreation(orderId).toEntity(localVarReturnType); } @@ -128,14 +127,13 @@ public ResponseSpec deleteOrderWithResponseSpec(@jakarta.annotation.Nonnull Stri * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -146,8 +144,8 @@ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseExcep String[] localVarAuthNames = new String[] { "api_key" }; - ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -158,7 +156,7 @@ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseExcep * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> getInventory() throws WebClientResponseException { - ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference>() {}; + ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; return getInventoryRequestCreation().bodyToMono(localVarReturnType); } @@ -170,7 +168,7 @@ public Mono> getInventory() throws WebClientResponseExcepti * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono>> getInventoryWithHttpInfo() throws WebClientResponseException { - ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference>() {}; + ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; return getInventoryRequestCreation().toEntity(localVarReturnType); } @@ -196,20 +194,19 @@ public ResponseSpec getInventoryWithResponseSpec() throws WebClientResponseExcep * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Long orderId) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new WebClientResponseException("Missing the required parameter 'orderId' when calling getOrderById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("order_id", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -220,8 +217,8 @@ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Lon String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -235,7 +232,7 @@ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Lon * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono getOrderById(@jakarta.annotation.Nonnull Long orderId) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return getOrderByIdRequestCreation(orderId).bodyToMono(localVarReturnType); } @@ -250,7 +247,7 @@ public Mono getOrderById(@jakarta.annotation.Nonnull Long orderId) throws * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> getOrderByIdWithHttpInfo(@jakarta.annotation.Nonnull Long orderId) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return getOrderByIdRequestCreation(orderId).toEntity(localVarReturnType); } @@ -278,18 +275,17 @@ public ResponseSpec getOrderByIdWithResponseSpec(@jakarta.annotation.Nonnull Lon * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order order) throws WebClientResponseException { - Object postBody = order; // verify the required parameter 'order' is set if (order == null) { throw new WebClientResponseException("Missing the required parameter 'order' when calling placeOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -302,8 +298,8 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, order, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -316,7 +312,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono placeOrder(@jakarta.annotation.Nonnull Order order) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return placeOrderRequestCreation(order).bodyToMono(localVarReturnType); } @@ -330,7 +326,7 @@ public Mono placeOrder(@jakarta.annotation.Nonnull Order order) throws We * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> placeOrderWithHttpInfo(@jakarta.annotation.Nonnull Order order) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return placeOrderRequestCreation(order).toEntity(localVarReturnType); } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/UserApi.java index eb583aa21edb..09008c4a7105 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/UserApi.java @@ -55,18 +55,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new WebClientResponseException("Missing the required parameter 'user' when calling createUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -77,8 +76,8 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -89,7 +88,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono createUser(@jakarta.annotation.Nonnull User user) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return createUserRequestCreation(user).bodyToMono(localVarReturnType); } @@ -101,7 +100,7 @@ public Mono createUser(@jakarta.annotation.Nonnull User user) throws WebCl * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> createUserWithHttpInfo(@jakarta.annotation.Nonnull User user) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return createUserRequestCreation(user).toEntity(localVarReturnType); } @@ -125,18 +124,17 @@ public ResponseSpec createUserWithResponseSpec(@jakarta.annotation.Nonnull User * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotation.Nonnull List user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new WebClientResponseException("Missing the required parameter 'user' when calling createUsersWithArrayInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -147,8 +145,8 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -159,7 +157,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono createUsersWithArrayInput(@jakarta.annotation.Nonnull List user) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return createUsersWithArrayInputRequestCreation(user).bodyToMono(localVarReturnType); } @@ -171,7 +169,7 @@ public Mono createUsersWithArrayInput(@jakarta.annotation.Nonnull List> createUsersWithArrayInputWithHttpInfo(@jakarta.annotation.Nonnull List user) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return createUsersWithArrayInputRequestCreation(user).toEntity(localVarReturnType); } @@ -195,18 +193,17 @@ public ResponseSpec createUsersWithArrayInputWithResponseSpec(@jakarta.annotatio * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation.Nonnull List user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new WebClientResponseException("Missing the required parameter 'user' when calling createUsersWithListInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -217,8 +214,8 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -229,7 +226,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono createUsersWithListInput(@jakarta.annotation.Nonnull List user) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return createUsersWithListInputRequestCreation(user).bodyToMono(localVarReturnType); } @@ -241,7 +238,7 @@ public Mono createUsersWithListInput(@jakarta.annotation.Nonnull List> createUsersWithListInputWithHttpInfo(@jakarta.annotation.Nonnull List user) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return createUsersWithListInputRequestCreation(user).toEntity(localVarReturnType); } @@ -266,20 +263,19 @@ public ResponseSpec createUsersWithListInputWithResponseSpec(@jakarta.annotation * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull String username) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling deleteUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -288,8 +284,8 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -301,7 +297,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono deleteUser(@jakarta.annotation.Nonnull String username) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return deleteUserRequestCreation(username).bodyToMono(localVarReturnType); } @@ -314,7 +310,7 @@ public Mono deleteUser(@jakarta.annotation.Nonnull String username) throws * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> deleteUserWithHttpInfo(@jakarta.annotation.Nonnull String username) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return deleteUserRequestCreation(username).toEntity(localVarReturnType); } @@ -342,20 +338,19 @@ public ResponseSpec deleteUserWithResponseSpec(@jakarta.annotation.Nonnull Strin * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull String username) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling getUserByName", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -366,8 +361,8 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -381,7 +376,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono getUserByName(@jakarta.annotation.Nonnull String username) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return getUserByNameRequestCreation(username).bodyToMono(localVarReturnType); } @@ -396,7 +391,7 @@ public Mono getUserByName(@jakarta.annotation.Nonnull String username) thr * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> getUserByNameWithHttpInfo(@jakarta.annotation.Nonnull String username) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return getUserByNameRequestCreation(username).toEntity(localVarReturnType); } @@ -425,7 +420,6 @@ public ResponseSpec getUserByNameWithResponseSpec(@jakarta.annotation.Nonnull St * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull String password) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling loginUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -435,12 +429,12 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String throw new WebClientResponseException("Missing the required parameter 'password' when calling loginUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); @@ -454,8 +448,8 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -469,7 +463,7 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono loginUser(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull String password) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return loginUserRequestCreation(username, password).bodyToMono(localVarReturnType); } @@ -484,7 +478,7 @@ public Mono loginUser(@jakarta.annotation.Nonnull String username, @jaka * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> loginUserWithHttpInfo(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull String password) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return loginUserRequestCreation(username, password).toEntity(localVarReturnType); } @@ -509,14 +503,13 @@ public ResponseSpec loginUserWithResponseSpec(@jakarta.annotation.Nonnull String * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -525,8 +518,8 @@ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseExcepti String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -536,7 +529,7 @@ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseExcepti * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono logoutUser() throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return logoutUserRequestCreation().bodyToMono(localVarReturnType); } @@ -547,7 +540,7 @@ public Mono logoutUser() throws WebClientResponseException { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> logoutUserWithHttpInfo() throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return logoutUserRequestCreation().toEntity(localVarReturnType); } @@ -572,7 +565,6 @@ public ResponseSpec logoutUserWithResponseSpec() throws WebClientResponseExcepti * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull User user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling updateUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -582,14 +574,14 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin throw new WebClientResponseException("Missing the required parameter 'user' when calling updateUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -600,8 +592,8 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -614,7 +606,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono updateUser(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull User user) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return updateUserRequestCreation(username, user).bodyToMono(localVarReturnType); } @@ -628,7 +620,7 @@ public Mono updateUser(@jakarta.annotation.Nonnull String username, @jakar * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> updateUserWithHttpInfo(@jakarta.annotation.Nonnull String username, @jakarta.annotation.Nonnull User user) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return updateUserRequestCreation(username, user).toEntity(localVarReturnType); } diff --git a/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java index 77930e0d2a29..088e29a33347 100644 --- a/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -54,14 +54,13 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec nullableArrayTestGetRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -73,7 +72,7 @@ private ResponseSpec nullableArrayTestGetRequestCreation() throws WebClientRespo String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/nullable-array-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/nullable-array-test", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FileApi.java b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FileApi.java index 920e37df185f..e25ffd1e024f 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FileApi.java +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FileApi.java @@ -55,20 +55,19 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fileIdGetRequestCreation(String id) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'id' is set if (id == null) { throw new WebClientResponseException("Missing the required parameter 'id' when calling fileIdGet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("id", id); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -79,8 +78,8 @@ private ResponseSpec fileIdGetRequestCreation(String id) throws WebClientRespons String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/file/{id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/file/{id}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -92,7 +91,7 @@ private ResponseSpec fileIdGetRequestCreation(String id) throws WebClientRespons * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono fileIdGet(String id) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fileIdGetRequestCreation(id).bodyToMono(localVarReturnType); } @@ -105,7 +104,7 @@ public Mono fileIdGet(String id) throws WebClientResponseException * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> fileIdGetWithHttpInfo(String id) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fileIdGetRequestCreation(id).toEntity(localVarReturnType); } diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FooApi.java b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FooApi.java index cce546002c2f..b3854f7aeb30 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FooApi.java +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/FooApi.java @@ -185,16 +185,15 @@ public ResponseSpec fooDtParamGetWithResponseSpec(FooDtParamGetRequest requestPa * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("dtParam", dtParam); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "dtQuery", dtQuery)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "color", color)); @@ -210,8 +209,8 @@ private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dt String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo/{dtParam}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/foo/{dtParam}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -226,7 +225,7 @@ private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dt * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono fooDtParamGet(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie, color).bodyToMono(localVarReturnType); } @@ -242,7 +241,7 @@ public Mono fooDtParamGet(java.time.@Nullable Instant dtParam, java.time.@N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> fooDtParamGetWithHttpInfo(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie, color).toEntity(localVarReturnType); } diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java index a7cf9f2d8749..e480e26a3fdf 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/RequiredAndNullableApi.java @@ -55,18 +55,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec requiredAndNullablePostRequestCreation(RequiredAndNullable requiredAndNullable) throws WebClientResponseException { - Object postBody = requiredAndNullable; // verify the required parameter 'requiredAndNullable' is set if (requiredAndNullable == null) { throw new WebClientResponseException("Missing the required parameter 'requiredAndNullable' when calling requiredAndNullablePost", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -79,8 +78,8 @@ private ResponseSpec requiredAndNullablePostRequestCreation(RequiredAndNullable String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/requiredAndNullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/requiredAndNullable", HttpMethod.POST, pathParams, localVarQueryParams, requiredAndNullable, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -92,7 +91,7 @@ private ResponseSpec requiredAndNullablePostRequestCreation(RequiredAndNullable * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono requiredAndNullablePost(RequiredAndNullable requiredAndNullable) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return requiredAndNullablePostRequestCreation(requiredAndNullable).bodyToMono(localVarReturnType); } @@ -105,7 +104,7 @@ public Mono requiredAndNullablePost(RequiredAndNullable req * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> requiredAndNullablePostWithHttpInfo(RequiredAndNullable requiredAndNullable) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return requiredAndNullablePostRequestCreation(requiredAndNullable).toEntity(localVarReturnType); } diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/UploadApi.java b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/UploadApi.java index fe9b7138aadc..255b3eb7f9c2 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/UploadApi.java +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/UploadApi.java @@ -55,17 +55,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFilesPostRequestCreation(java.util.@Nullable Collection _file) throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (_file != null) + if (_file != null) { formParams.addAll("file", _file.stream().collect(Collectors.toList())); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -76,8 +76,8 @@ private ResponseSpec uploadFilesPostRequestCreation(java.util.@Nullable Collecti String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/uploadFiles", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/uploadFiles", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -88,7 +88,7 @@ private ResponseSpec uploadFilesPostRequestCreation(java.util.@Nullable Collecti * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono uploadFilesPost(java.util.@Nullable Collection _file) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return uploadFilesPostRequestCreation(_file).bodyToMono(localVarReturnType); } @@ -100,7 +100,7 @@ public Mono uploadFilesPost(java.util.@Nullable Collection> uploadFilesPostWithHttpInfo(java.util.@Nullable Collection _file) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return uploadFilesPostRequestCreation(_file).toEntity(localVarReturnType); } @@ -124,17 +124,17 @@ public ResponseSpec uploadFilesPostWithResponseSpec(java.util.@Nullable Collecti * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadPostRequestCreation(org.springframework.core.io.@Nullable Resource _file) throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (_file != null) + if (_file != null) { formParams.add("file", _file); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -145,8 +145,8 @@ private ResponseSpec uploadPostRequestCreation(org.springframework.core.io.@Null String[] localVarAuthNames = new String[] { }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/upload", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/upload", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -157,7 +157,7 @@ private ResponseSpec uploadPostRequestCreation(org.springframework.core.io.@Null * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono uploadPost(org.springframework.core.io.@Nullable Resource _file) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return uploadPostRequestCreation(_file).bodyToMono(localVarReturnType); } @@ -169,7 +169,7 @@ public Mono uploadPost(org.springframework.core.io.@Nullable Resource _fil * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> uploadPostWithHttpInfo(org.springframework.core.io.@Nullable Resource _file) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return uploadPostRequestCreation(_file).toEntity(localVarReturnType); } diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/webclient-springBoot4-jackson3/src/main/java/org/openapitools/client/api/PetApi.java index 34782a6dab5c..1a4c0fd522cf 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3/src/main/java/org/openapitools/client/api/PetApi.java @@ -56,18 +56,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) throws WebClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new WebClientResponseException("Missing the required parameter 'pet' when calling addPet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -80,8 +79,8 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) String[] localVarAuthNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -94,7 +93,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono addPet(@jakarta.annotation.Nonnull Pet pet) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return addPetRequestCreation(pet).bodyToMono(localVarReturnType); } @@ -108,7 +107,7 @@ public Mono addPet(@jakarta.annotation.Nonnull Pet pet) throws WebClientRes * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> addPetWithHttpInfo(@jakarta.annotation.Nonnull Pet pet) throws WebClientResponseException { - ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; return addPetRequestCreation(pet).toEntity(localVarReturnType); } diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index a23c5980ed10..c509265b5b86 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -55,18 +55,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec call123testSpecialTagsRequestCreation(@javax.annotation.Nonnull Client client) throws WebClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new WebClientResponseException("Missing the required parameter 'client' when calling call123testSpecialTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -80,7 +79,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/DefaultApi.java index 481a9082f9f9..390814e30c58 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -54,14 +54,13 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -73,7 +72,7 @@ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java index d45f4d9092b4..7d84ae82c6e0 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -68,14 +68,13 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -87,7 +86,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponse String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -133,14 +132,13 @@ public ResponseSpec fakeBigDecimalMapWithResponseSpec() throws WebClientResponse * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -152,7 +150,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseExce String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -200,23 +198,24 @@ public ResponseSpec fakeHealthGetWithResponseSpec() throws WebClientResponseExce * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHttpSignatureTestRequestCreation(@javax.annotation.Nonnull Pet pet, @javax.annotation.Nullable String query1, @javax.annotation.Nullable String header1) throws WebClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new WebClientResponseException("Missing the required parameter 'pet' when calling fakeHttpSignatureTest", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); - if (header1 != null) - headerParams.add("header_1", apiClient.parameterToString(header1)); + if (header1 != null) { + headerParams.add("header_1", apiClient.parameterToString(header1)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { @@ -227,7 +226,7 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@javax.annotation.Nonn String[] localVarAuthNames = new String[] { "http_signature_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -281,14 +280,13 @@ public ResponseSpec fakeHttpSignatureTestWithResponseSpec(@javax.annotation.Nonn * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@javax.annotation.Nullable Boolean body) throws WebClientResponseException { - Object postBody = body; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -302,7 +300,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@javax.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -352,14 +350,13 @@ public ResponseSpec fakeOuterBooleanSerializeWithResponseSpec(@javax.annotation. * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@javax.annotation.Nullable OuterComposite outerComposite) throws WebClientResponseException { - Object postBody = outerComposite; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -373,7 +370,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@javax.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, outerComposite, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -423,14 +420,13 @@ public ResponseSpec fakeOuterCompositeSerializeWithResponseSpec(@javax.annotatio * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@javax.annotation.Nullable BigDecimal body) throws WebClientResponseException { - Object postBody = body; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -444,7 +440,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -494,14 +490,13 @@ public ResponseSpec fakeOuterNumberSerializeWithResponseSpec(@javax.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterStringSerializeRequestCreation(@javax.annotation.Nullable String body) throws WebClientResponseException { - Object postBody = body; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -515,7 +510,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -565,18 +560,17 @@ public ResponseSpec fakeOuterStringSerializeWithResponseSpec(@javax.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@javax.annotation.Nonnull OuterObjectWithEnumProperty outerObjectWithEnumProperty) throws WebClientResponseException { - Object postBody = outerObjectWithEnumProperty; // verify the required parameter 'outerObjectWithEnumProperty' is set if (outerObjectWithEnumProperty == null) { throw new WebClientResponseException("Missing the required parameter 'outerObjectWithEnumProperty' when calling fakePropertyEnumIntegerSerialize", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -590,7 +584,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@javax.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, outerObjectWithEnumProperty, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -639,18 +633,17 @@ public ResponseSpec fakePropertyEnumIntegerSerializeWithResponseSpec(@javax.anno * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@javax.annotation.Nonnull Map requestBody) throws WebClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new WebClientResponseException("Missing the required parameter 'requestBody' when calling testAdditionalPropertiesReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -662,7 +655,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@javax.ann String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -709,18 +702,17 @@ public ResponseSpec testAdditionalPropertiesReferenceWithResponseSpec(@javax.ann * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithBinaryRequestCreation(@javax.annotation.Nullable File body) throws WebClientResponseException { - Object postBody = body; // verify the required parameter 'body' is set if (body == null) { throw new WebClientResponseException("Missing the required parameter 'body' when calling testBodyWithBinary", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -732,7 +724,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@javax.annotation.Nullabl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -779,18 +771,17 @@ public ResponseSpec testBodyWithBinaryWithResponseSpec(@javax.annotation.Nullabl * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithFileSchemaRequestCreation(@javax.annotation.Nonnull FileSchemaTestClass fileSchemaTestClass) throws WebClientResponseException { - Object postBody = fileSchemaTestClass; // verify the required parameter 'fileSchemaTestClass' is set if (fileSchemaTestClass == null) { throw new WebClientResponseException("Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -802,7 +793,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, fileSchemaTestClass, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -850,7 +841,6 @@ public ResponseSpec testBodyWithFileSchemaWithResponseSpec(@javax.annotation.Non * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithQueryParamsRequestCreation(@javax.annotation.Nonnull String query, @javax.annotation.Nonnull User user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'query' is set if (query == null) { throw new WebClientResponseException("Missing the required parameter 'query' when calling testBodyWithQueryParams", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -860,12 +850,12 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@javax.annotation.No throw new WebClientResponseException("Missing the required parameter 'user' when calling testBodyWithQueryParams", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); @@ -879,7 +869,7 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@javax.annotation.No String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -930,18 +920,17 @@ public ResponseSpec testBodyWithQueryParamsWithResponseSpec(@javax.annotation.No * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClientModelRequestCreation(@javax.annotation.Nonnull Client client) throws WebClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new WebClientResponseException("Missing the required parameter 'client' when calling testClientModel", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -955,7 +944,7 @@ private ResponseSpec testClientModelRequestCreation(@javax.annotation.Nonnull Cl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1018,7 +1007,6 @@ public ResponseSpec testClientModelWithResponseSpec(@javax.annotation.Nonnull Cl * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEndpointParametersRequestCreation(@javax.annotation.Nonnull BigDecimal number, @javax.annotation.Nonnull Double _double, @javax.annotation.Nonnull String patternWithoutDelimiter, @javax.annotation.Nonnull byte[] _byte, @javax.annotation.Nullable Integer integer, @javax.annotation.Nullable Integer int32, @javax.annotation.Nullable Long int64, @javax.annotation.Nullable Float _float, @javax.annotation.Nullable String string, @javax.annotation.Nullable File binary, @javax.annotation.Nullable LocalDate date, @javax.annotation.Nullable OffsetDateTime dateTime, @javax.annotation.Nullable String password, @javax.annotation.Nullable String paramCallback) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'number' is set if (number == null) { throw new WebClientResponseException("Missing the required parameter 'number' when calling testEndpointParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1036,41 +1024,47 @@ private ResponseSpec testEndpointParametersRequestCreation(@javax.annotation.Non throw new WebClientResponseException("Missing the required parameter '_byte' when calling testEndpointParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (integer != null) + if (integer != null) { formParams.add("integer", integer); - if (int32 != null) + } + if (int32 != null) { formParams.add("int32", int32); - if (int64 != null) + } + if (int64 != null) { formParams.add("int64", int64); - if (number != null) - formParams.add("number", number); - if (_float != null) + } + formParams.add("number", number); + if (_float != null) { formParams.add("float", _float); - if (_double != null) - formParams.add("double", _double); - if (string != null) + } + formParams.add("double", _double); + if (string != null) { formParams.add("string", string); - if (patternWithoutDelimiter != null) - formParams.add("pattern_without_delimiter", patternWithoutDelimiter); - if (_byte != null) - formParams.add("byte", _byte); - if (binary != null) + } + formParams.add("pattern_without_delimiter", patternWithoutDelimiter); + formParams.add("byte", _byte); + if (binary != null) { formParams.add("binary", new FileSystemResource(binary)); - if (date != null) + } + if (date != null) { formParams.add("date", date); - if (dateTime != null) + } + if (dateTime != null) { formParams.add("dateTime", dateTime); - if (password != null) + } + if (password != null) { formParams.add("password", password); - if (paramCallback != null) + } + if (paramCallback != null) { formParams.add("callback", paramCallback); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1082,7 +1076,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { "http_basic_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1180,14 +1174,13 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@javax.annotation.Non * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString)); @@ -1195,14 +1188,19 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); - if (enumHeaderStringArray != null) - headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); - if (enumHeaderString != null) - headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); - if (enumFormStringArray != null) + if (enumHeaderStringArray != null) { + headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); + } + if (enumHeaderString != null) { + headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + } + + if (enumFormStringArray != null) { formParams.addAll("enum_form_string_array", enumFormStringArray); - if (enumFormString != null) + } + if (enumFormString != null) { formParams.add("enum_form_string", enumFormString); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1214,7 +1212,7 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1293,7 +1291,6 @@ public ResponseSpec testEnumParametersWithResponseSpec(@javax.annotation.Nullabl * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnull Integer requiredStringGroup, @javax.annotation.Nonnull Boolean requiredBooleanGroup, @javax.annotation.Nonnull Long requiredInt64Group, @javax.annotation.Nullable Integer stringGroup, @javax.annotation.Nullable Boolean booleanGroup, @javax.annotation.Nullable Long int64Group) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'requiredStringGroup' is set if (requiredStringGroup == null) { throw new WebClientResponseException("Missing the required parameter 'requiredStringGroup' when calling testGroupParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1307,22 +1304,23 @@ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnul throw new WebClientResponseException("Missing the required parameter 'requiredInt64Group' when calling testGroupParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); - if (requiredBooleanGroup != null) headerParams.add("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); - if (booleanGroup != null) - headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + if (booleanGroup != null) { + headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -1331,7 +1329,7 @@ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnul String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1393,18 +1391,17 @@ public ResponseSpec testGroupParametersWithResponseSpec(@javax.annotation.Nonnul * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@javax.annotation.Nonnull Map requestBody) throws WebClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new WebClientResponseException("Missing the required parameter 'requestBody' when calling testInlineAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1416,7 +1413,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@javax.annota String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1463,18 +1460,17 @@ public ResponseSpec testInlineAdditionalPropertiesWithResponseSpec(@javax.annota * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@javax.annotation.Nonnull TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest) throws WebClientResponseException { - Object postBody = testInlineFreeformAdditionalPropertiesRequest; // verify the required parameter 'testInlineFreeformAdditionalPropertiesRequest' is set if (testInlineFreeformAdditionalPropertiesRequest == null) { throw new WebClientResponseException("Missing the required parameter 'testInlineFreeformAdditionalPropertiesRequest' when calling testInlineFreeformAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1486,7 +1482,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@java String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, testInlineFreeformAdditionalPropertiesRequest, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1534,7 +1530,6 @@ public ResponseSpec testInlineFreeformAdditionalPropertiesWithResponseSpec(@java * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull String param, @javax.annotation.Nonnull String param2) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'param' is set if (param == null) { throw new WebClientResponseException("Missing the required parameter 'param' when calling testJsonFormData", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1544,17 +1539,15 @@ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull S throw new WebClientResponseException("Missing the required parameter 'param2' when calling testJsonFormData", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (param != null) - formParams.add("param", param); - if (param2 != null) - formParams.add("param2", param2); + formParams.add("param", param); + formParams.add("param2", param2); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1566,7 +1559,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull S String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1616,18 +1609,17 @@ public ResponseSpec testJsonFormDataWithResponseSpec(@javax.annotation.Nonnull S * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testNullableRequestCreation(@javax.annotation.Nonnull ChildWithNullable childWithNullable) throws WebClientResponseException { - Object postBody = childWithNullable; // verify the required parameter 'childWithNullable' is set if (childWithNullable == null) { throw new WebClientResponseException("Missing the required parameter 'childWithNullable' when calling testNullable", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1639,7 +1631,7 @@ private ResponseSpec testNullableRequestCreation(@javax.annotation.Nonnull Child String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, childWithNullable, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1692,7 +1684,6 @@ public ResponseSpec testNullableWithResponseSpec(@javax.annotation.Nonnull Child * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.annotation.Nonnull List pipe, @javax.annotation.Nonnull List ioutil, @javax.annotation.Nonnull List http, @javax.annotation.Nonnull List url, @javax.annotation.Nonnull List context, @javax.annotation.Nonnull String allowEmpty, @javax.annotation.Nullable Map language) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'pipe' is set if (pipe == null) { throw new WebClientResponseException("Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1718,12 +1709,12 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.an throw new WebClientResponseException("Missing the required parameter 'allowEmpty' when calling testQueryParameterCollectionFormat", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("pipes".toUpperCase(Locale.ROOT)), "pipe", pipe)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil)); @@ -1741,7 +1732,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1806,18 +1797,17 @@ public ResponseSpec testQueryParameterCollectionFormatWithResponseSpec(@javax.an * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testStringMapReferenceRequestCreation(@javax.annotation.Nonnull Map requestBody) throws WebClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new WebClientResponseException("Missing the required parameter 'requestBody' when calling testStringMapReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1829,7 +1819,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 4b8ed0a8b8fd..7f4238f69d37 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -55,18 +55,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClassnameRequestCreation(@javax.annotation.Nonnull Client client) throws WebClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new WebClientResponseException("Missing the required parameter 'client' when calling testClassname", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -80,7 +79,7 @@ private ResponseSpec testClassnameRequestCreation(@javax.annotation.Nonnull Clie String[] localVarAuthNames = new String[] { "api_key_query" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/PetApi.java index 232aba5307e8..134353ba2b00 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/PetApi.java @@ -58,18 +58,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec addPetRequestCreation(@javax.annotation.Nonnull Pet pet) throws WebClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new WebClientResponseException("Missing the required parameter 'pet' when calling addPet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -81,7 +80,7 @@ private ResponseSpec addPetRequestCreation(@javax.annotation.Nonnull Pet pet) th String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -133,23 +132,24 @@ public ResponseSpec addPetWithResponseSpec(@javax.annotation.Nonnull Pet pet) th * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deletePetRequestCreation(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String apiKey) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling deletePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); + + if (apiKey != null) { + headerParams.add("api_key", apiClient.parameterToString(apiKey)); + } - if (apiKey != null) - headerParams.add("api_key", apiClient.parameterToString(apiKey)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -158,7 +158,7 @@ private ResponseSpec deletePetRequestCreation(@javax.annotation.Nonnull Long pet String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -213,18 +213,17 @@ public ResponseSpec deletePetWithResponseSpec(@javax.annotation.Nonnull Long pet * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec findPetsByStatusRequestCreation(@javax.annotation.Nonnull List status) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'status' is set if (status == null) { throw new WebClientResponseException("Missing the required parameter 'status' when calling findPetsByStatus", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); @@ -238,7 +237,7 @@ private ResponseSpec findPetsByStatusRequestCreation(@javax.annotation.Nonnull L String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -294,18 +293,17 @@ public ResponseSpec findPetsByStatusWithResponseSpec(@javax.annotation.Nonnull L */ @Deprecated private ResponseSpec findPetsByTagsRequestCreation(@javax.annotation.Nonnull Set tags) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'tags' is set if (tags == null) { throw new WebClientResponseException("Missing the required parameter 'tags' when calling findPetsByTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); @@ -319,7 +317,7 @@ private ResponseSpec findPetsByTagsRequestCreation(@javax.annotation.Nonnull Set String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -380,20 +378,19 @@ public ResponseSpec findPetsByTagsWithResponseSpec(@javax.annotation.Nonnull Set * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getPetByIdRequestCreation(@javax.annotation.Nonnull Long petId) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling getPetById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -405,7 +402,7 @@ private ResponseSpec getPetByIdRequestCreation(@javax.annotation.Nonnull Long pe String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -463,18 +460,17 @@ public ResponseSpec getPetByIdWithResponseSpec(@javax.annotation.Nonnull Long pe * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetRequestCreation(@javax.annotation.Nonnull Pet pet) throws WebClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new WebClientResponseException("Missing the required parameter 'pet' when calling updatePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -486,7 +482,7 @@ private ResponseSpec updatePetRequestCreation(@javax.annotation.Nonnull Pet pet) String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -545,25 +541,26 @@ public ResponseSpec updatePetWithResponseSpec(@javax.annotation.Nonnull Pet pet) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetWithFormRequestCreation(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String name, @javax.annotation.Nullable String status) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling updatePetWithForm", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (name != null) + if (name != null) { formParams.add("name", name); - if (status != null) + } + if (status != null) { formParams.add("status", status); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -575,7 +572,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@javax.annotation.Nonnull String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -634,25 +631,26 @@ public ResponseSpec updatePetWithFormWithResponseSpec(@javax.annotation.Nonnull * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileRequestCreation(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String additionalMetadata, @javax.annotation.Nullable File _file) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling uploadFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (_file != null) + } + if (_file != null) { formParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { "application/json" @@ -666,7 +664,7 @@ private ResponseSpec uploadFileRequestCreation(@javax.annotation.Nonnull Long pe String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -724,7 +722,6 @@ public ResponseSpec uploadFileWithResponseSpec(@javax.annotation.Nonnull Long pe * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@javax.annotation.Nonnull Long petId, @javax.annotation.Nonnull File requiredFile, @javax.annotation.Nullable String additionalMetadata) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling uploadFileWithRequiredFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -734,19 +731,19 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@javax.annotation throw new WebClientResponseException("Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (requiredFile != null) - formParams.add("requiredFile", new FileSystemResource(requiredFile)); + } + formParams.add("requiredFile", new FileSystemResource(requiredFile)); final String[] localVarAccepts = { "application/json" @@ -760,7 +757,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@javax.annotation String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/StoreApi.java index f7d1a89132ec..bd1155c32ec9 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/StoreApi.java @@ -55,20 +55,19 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteOrderRequestCreation(@javax.annotation.Nonnull String orderId) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new WebClientResponseException("Missing the required parameter 'orderId' when calling deleteOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("order_id", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -78,7 +77,7 @@ private ResponseSpec deleteOrderRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -128,14 +127,13 @@ public ResponseSpec deleteOrderWithResponseSpec(@javax.annotation.Nonnull String * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -147,7 +145,7 @@ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseExcep String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -196,20 +194,19 @@ public ResponseSpec getInventoryWithResponseSpec() throws WebClientResponseExcep * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getOrderByIdRequestCreation(@javax.annotation.Nonnull Long orderId) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new WebClientResponseException("Missing the required parameter 'orderId' when calling getOrderById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("order_id", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -221,7 +218,7 @@ private ResponseSpec getOrderByIdRequestCreation(@javax.annotation.Nonnull Long String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -278,18 +275,17 @@ public ResponseSpec getOrderByIdWithResponseSpec(@javax.annotation.Nonnull Long * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec placeOrderRequestCreation(@javax.annotation.Nonnull Order order) throws WebClientResponseException { - Object postBody = order; // verify the required parameter 'order' is set if (order == null) { throw new WebClientResponseException("Missing the required parameter 'order' when calling placeOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -303,7 +299,7 @@ private ResponseSpec placeOrderRequestCreation(@javax.annotation.Nonnull Order o String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, order, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/UserApi.java index ec1593a3fa8f..ef59f43778fb 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/UserApi.java @@ -55,18 +55,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUserRequestCreation(@javax.annotation.Nonnull User user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new WebClientResponseException("Missing the required parameter 'user' when calling createUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -78,7 +77,7 @@ private ResponseSpec createUserRequestCreation(@javax.annotation.Nonnull User us String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -125,18 +124,17 @@ public ResponseSpec createUserWithResponseSpec(@javax.annotation.Nonnull User us * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithArrayInputRequestCreation(@javax.annotation.Nonnull List user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new WebClientResponseException("Missing the required parameter 'user' when calling createUsersWithArrayInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -148,7 +146,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@javax.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -195,18 +193,17 @@ public ResponseSpec createUsersWithArrayInputWithResponseSpec(@javax.annotation. * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithListInputRequestCreation(@javax.annotation.Nonnull List user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new WebClientResponseException("Missing the required parameter 'user' when calling createUsersWithListInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -218,7 +215,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -266,20 +263,19 @@ public ResponseSpec createUsersWithListInputWithResponseSpec(@javax.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteUserRequestCreation(@javax.annotation.Nonnull String username) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling deleteUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -289,7 +285,7 @@ private ResponseSpec deleteUserRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -342,20 +338,19 @@ public ResponseSpec deleteUserWithResponseSpec(@javax.annotation.Nonnull String * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getUserByNameRequestCreation(@javax.annotation.Nonnull String username) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling getUserByName", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -367,7 +362,7 @@ private ResponseSpec getUserByNameRequestCreation(@javax.annotation.Nonnull Stri String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -425,7 +420,6 @@ public ResponseSpec getUserByNameWithResponseSpec(@javax.annotation.Nonnull Stri * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec loginUserRequestCreation(@javax.annotation.Nonnull String username, @javax.annotation.Nonnull String password) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling loginUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -435,12 +429,12 @@ private ResponseSpec loginUserRequestCreation(@javax.annotation.Nonnull String u throw new WebClientResponseException("Missing the required parameter 'password' when calling loginUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); @@ -455,7 +449,7 @@ private ResponseSpec loginUserRequestCreation(@javax.annotation.Nonnull String u String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -509,14 +503,13 @@ public ResponseSpec loginUserWithResponseSpec(@javax.annotation.Nonnull String u * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -526,7 +519,7 @@ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseExcepti String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -572,7 +565,6 @@ public ResponseSpec logoutUserWithResponseSpec() throws WebClientResponseExcepti * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String username, @javax.annotation.Nonnull User user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling updateUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -582,14 +574,14 @@ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String throw new WebClientResponseException("Missing the required parameter 'user' when calling updateUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -601,7 +593,7 @@ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index a23c5980ed10..c509265b5b86 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -55,18 +55,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec call123testSpecialTagsRequestCreation(@javax.annotation.Nonnull Client client) throws WebClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new WebClientResponseException("Missing the required parameter 'client' when calling call123testSpecialTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -80,7 +79,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/DefaultApi.java index 481a9082f9f9..390814e30c58 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -54,14 +54,13 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -73,7 +72,7 @@ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java index c36bb0cc5d28..9f350bb65f6a 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java @@ -68,14 +68,13 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -87,7 +86,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponse String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -133,14 +132,13 @@ public ResponseSpec fakeBigDecimalMapWithResponseSpec() throws WebClientResponse * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -152,7 +150,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseExce String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -311,23 +309,24 @@ public ResponseSpec fakeHttpSignatureTestWithResponseSpec(FakeHttpSignatureTestR * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHttpSignatureTestRequestCreation(@javax.annotation.Nonnull Pet pet, @javax.annotation.Nullable String query1, @javax.annotation.Nullable String header1) throws WebClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new WebClientResponseException("Missing the required parameter 'pet' when calling fakeHttpSignatureTest", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); - if (header1 != null) - headerParams.add("header_1", apiClient.parameterToString(header1)); + if (header1 != null) { + headerParams.add("header_1", apiClient.parameterToString(header1)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { @@ -338,7 +337,7 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@javax.annotation.Nonn String[] localVarAuthNames = new String[] { "http_signature_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -392,14 +391,13 @@ public ResponseSpec fakeHttpSignatureTestWithResponseSpec(@javax.annotation.Nonn * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@javax.annotation.Nullable Boolean body) throws WebClientResponseException { - Object postBody = body; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -413,7 +411,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@javax.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -463,14 +461,13 @@ public ResponseSpec fakeOuterBooleanSerializeWithResponseSpec(@javax.annotation. * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@javax.annotation.Nullable OuterComposite outerComposite) throws WebClientResponseException { - Object postBody = outerComposite; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -484,7 +481,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@javax.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, outerComposite, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -534,14 +531,13 @@ public ResponseSpec fakeOuterCompositeSerializeWithResponseSpec(@javax.annotatio * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@javax.annotation.Nullable BigDecimal body) throws WebClientResponseException { - Object postBody = body; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -555,7 +551,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -605,14 +601,13 @@ public ResponseSpec fakeOuterNumberSerializeWithResponseSpec(@javax.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterStringSerializeRequestCreation(@javax.annotation.Nullable String body) throws WebClientResponseException { - Object postBody = body; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -626,7 +621,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -676,18 +671,17 @@ public ResponseSpec fakeOuterStringSerializeWithResponseSpec(@javax.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@javax.annotation.Nonnull OuterObjectWithEnumProperty outerObjectWithEnumProperty) throws WebClientResponseException { - Object postBody = outerObjectWithEnumProperty; // verify the required parameter 'outerObjectWithEnumProperty' is set if (outerObjectWithEnumProperty == null) { throw new WebClientResponseException("Missing the required parameter 'outerObjectWithEnumProperty' when calling fakePropertyEnumIntegerSerialize", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -701,7 +695,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@javax.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, outerObjectWithEnumProperty, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -750,18 +744,17 @@ public ResponseSpec fakePropertyEnumIntegerSerializeWithResponseSpec(@javax.anno * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@javax.annotation.Nonnull Map requestBody) throws WebClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new WebClientResponseException("Missing the required parameter 'requestBody' when calling testAdditionalPropertiesReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -773,7 +766,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@javax.ann String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -820,18 +813,17 @@ public ResponseSpec testAdditionalPropertiesReferenceWithResponseSpec(@javax.ann * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithBinaryRequestCreation(@javax.annotation.Nullable File body) throws WebClientResponseException { - Object postBody = body; // verify the required parameter 'body' is set if (body == null) { throw new WebClientResponseException("Missing the required parameter 'body' when calling testBodyWithBinary", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -843,7 +835,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@javax.annotation.Nullabl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -890,18 +882,17 @@ public ResponseSpec testBodyWithBinaryWithResponseSpec(@javax.annotation.Nullabl * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithFileSchemaRequestCreation(@javax.annotation.Nonnull FileSchemaTestClass fileSchemaTestClass) throws WebClientResponseException { - Object postBody = fileSchemaTestClass; // verify the required parameter 'fileSchemaTestClass' is set if (fileSchemaTestClass == null) { throw new WebClientResponseException("Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -913,7 +904,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, fileSchemaTestClass, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1060,7 +1051,6 @@ public ResponseSpec testBodyWithQueryParamsWithResponseSpec(TestBodyWithQueryPar * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithQueryParamsRequestCreation(@javax.annotation.Nonnull String query, @javax.annotation.Nonnull User user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'query' is set if (query == null) { throw new WebClientResponseException("Missing the required parameter 'query' when calling testBodyWithQueryParams", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1070,12 +1060,12 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@javax.annotation.No throw new WebClientResponseException("Missing the required parameter 'user' when calling testBodyWithQueryParams", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); @@ -1089,7 +1079,7 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@javax.annotation.No String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1140,18 +1130,17 @@ public ResponseSpec testBodyWithQueryParamsWithResponseSpec(@javax.annotation.No * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClientModelRequestCreation(@javax.annotation.Nonnull Client client) throws WebClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new WebClientResponseException("Missing the required parameter 'client' when calling testClientModel", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -1165,7 +1154,7 @@ private ResponseSpec testClientModelRequestCreation(@javax.annotation.Nonnull Cl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1474,7 +1463,6 @@ public ResponseSpec testEndpointParametersWithResponseSpec(TestEndpointParameter * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEndpointParametersRequestCreation(@javax.annotation.Nonnull BigDecimal number, @javax.annotation.Nonnull Double _double, @javax.annotation.Nonnull String patternWithoutDelimiter, @javax.annotation.Nonnull byte[] _byte, @javax.annotation.Nullable Integer integer, @javax.annotation.Nullable Integer int32, @javax.annotation.Nullable Long int64, @javax.annotation.Nullable Float _float, @javax.annotation.Nullable String string, @javax.annotation.Nullable File binary, @javax.annotation.Nullable LocalDate date, @javax.annotation.Nullable OffsetDateTime dateTime, @javax.annotation.Nullable String password, @javax.annotation.Nullable String paramCallback) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'number' is set if (number == null) { throw new WebClientResponseException("Missing the required parameter 'number' when calling testEndpointParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1492,41 +1480,47 @@ private ResponseSpec testEndpointParametersRequestCreation(@javax.annotation.Non throw new WebClientResponseException("Missing the required parameter '_byte' when calling testEndpointParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (integer != null) + if (integer != null) { formParams.add("integer", integer); - if (int32 != null) + } + if (int32 != null) { formParams.add("int32", int32); - if (int64 != null) + } + if (int64 != null) { formParams.add("int64", int64); - if (number != null) - formParams.add("number", number); - if (_float != null) + } + formParams.add("number", number); + if (_float != null) { formParams.add("float", _float); - if (_double != null) - formParams.add("double", _double); - if (string != null) + } + formParams.add("double", _double); + if (string != null) { formParams.add("string", string); - if (patternWithoutDelimiter != null) - formParams.add("pattern_without_delimiter", patternWithoutDelimiter); - if (_byte != null) - formParams.add("byte", _byte); - if (binary != null) + } + formParams.add("pattern_without_delimiter", patternWithoutDelimiter); + formParams.add("byte", _byte); + if (binary != null) { formParams.add("binary", new FileSystemResource(binary)); - if (date != null) + } + if (date != null) { formParams.add("date", date); - if (dateTime != null) + } + if (dateTime != null) { formParams.add("dateTime", dateTime); - if (password != null) + } + if (password != null) { formParams.add("password", password); - if (paramCallback != null) + } + if (paramCallback != null) { formParams.add("callback", paramCallback); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1538,7 +1532,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { "http_basic_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1822,14 +1816,13 @@ public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString)); @@ -1837,14 +1830,19 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); - if (enumHeaderStringArray != null) - headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); - if (enumHeaderString != null) - headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); - if (enumFormStringArray != null) + if (enumHeaderStringArray != null) { + headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); + } + if (enumHeaderString != null) { + headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + } + + if (enumFormStringArray != null) { formParams.addAll("enum_form_string_array", enumFormStringArray); - if (enumFormString != null) + } + if (enumFormString != null) { formParams.add("enum_form_string", enumFormString); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1856,7 +1854,7 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2082,7 +2080,6 @@ public ResponseSpec testGroupParametersWithResponseSpec(TestGroupParametersReque * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnull Integer requiredStringGroup, @javax.annotation.Nonnull Boolean requiredBooleanGroup, @javax.annotation.Nonnull Long requiredInt64Group, @javax.annotation.Nullable Integer stringGroup, @javax.annotation.Nullable Boolean booleanGroup, @javax.annotation.Nullable Long int64Group) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'requiredStringGroup' is set if (requiredStringGroup == null) { throw new WebClientResponseException("Missing the required parameter 'requiredStringGroup' when calling testGroupParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -2096,22 +2093,23 @@ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnul throw new WebClientResponseException("Missing the required parameter 'requiredInt64Group' when calling testGroupParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); - if (requiredBooleanGroup != null) headerParams.add("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); - if (booleanGroup != null) - headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + if (booleanGroup != null) { + headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -2120,7 +2118,7 @@ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnul String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2182,18 +2180,17 @@ public ResponseSpec testGroupParametersWithResponseSpec(@javax.annotation.Nonnul * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@javax.annotation.Nonnull Map requestBody) throws WebClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new WebClientResponseException("Missing the required parameter 'requestBody' when calling testInlineAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -2205,7 +2202,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@javax.annota String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2252,18 +2249,17 @@ public ResponseSpec testInlineAdditionalPropertiesWithResponseSpec(@javax.annota * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@javax.annotation.Nonnull TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest) throws WebClientResponseException { - Object postBody = testInlineFreeformAdditionalPropertiesRequest; // verify the required parameter 'testInlineFreeformAdditionalPropertiesRequest' is set if (testInlineFreeformAdditionalPropertiesRequest == null) { throw new WebClientResponseException("Missing the required parameter 'testInlineFreeformAdditionalPropertiesRequest' when calling testInlineFreeformAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -2275,7 +2271,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@java String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, testInlineFreeformAdditionalPropertiesRequest, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2422,7 +2418,6 @@ public ResponseSpec testJsonFormDataWithResponseSpec(TestJsonFormDataRequest req * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull String param, @javax.annotation.Nonnull String param2) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'param' is set if (param == null) { throw new WebClientResponseException("Missing the required parameter 'param' when calling testJsonFormData", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -2432,17 +2427,15 @@ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull S throw new WebClientResponseException("Missing the required parameter 'param2' when calling testJsonFormData", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (param != null) - formParams.add("param", param); - if (param2 != null) - formParams.add("param2", param2); + formParams.add("param", param); + formParams.add("param2", param2); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -2454,7 +2447,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull S String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2504,18 +2497,17 @@ public ResponseSpec testJsonFormDataWithResponseSpec(@javax.annotation.Nonnull S * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testNullableRequestCreation(@javax.annotation.Nonnull ChildWithNullable childWithNullable) throws WebClientResponseException { - Object postBody = childWithNullable; // verify the required parameter 'childWithNullable' is set if (childWithNullable == null) { throw new WebClientResponseException("Missing the required parameter 'childWithNullable' when calling testNullable", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -2527,7 +2519,7 @@ private ResponseSpec testNullableRequestCreation(@javax.annotation.Nonnull Child String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, childWithNullable, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2739,7 +2731,6 @@ public ResponseSpec testQueryParameterCollectionFormatWithResponseSpec(TestQuery * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.annotation.Nonnull List pipe, @javax.annotation.Nonnull List ioutil, @javax.annotation.Nonnull List http, @javax.annotation.Nonnull List url, @javax.annotation.Nonnull List context, @javax.annotation.Nonnull String allowEmpty, @javax.annotation.Nullable Map language) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'pipe' is set if (pipe == null) { throw new WebClientResponseException("Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -2765,12 +2756,12 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.an throw new WebClientResponseException("Missing the required parameter 'allowEmpty' when calling testQueryParameterCollectionFormat", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("pipes".toUpperCase(Locale.ROOT)), "pipe", pipe)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil)); @@ -2788,7 +2779,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2853,18 +2844,17 @@ public ResponseSpec testQueryParameterCollectionFormatWithResponseSpec(@javax.an * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testStringMapReferenceRequestCreation(@javax.annotation.Nonnull Map requestBody) throws WebClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new WebClientResponseException("Missing the required parameter 'requestBody' when calling testStringMapReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -2876,7 +2866,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 4b8ed0a8b8fd..7f4238f69d37 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -55,18 +55,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClassnameRequestCreation(@javax.annotation.Nonnull Client client) throws WebClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new WebClientResponseException("Missing the required parameter 'client' when calling testClassname", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -80,7 +79,7 @@ private ResponseSpec testClassnameRequestCreation(@javax.annotation.Nonnull Clie String[] localVarAuthNames = new String[] { "api_key_query" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java index 453a7dc9ca0d..267adda46a2a 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java @@ -58,18 +58,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec addPetRequestCreation(@javax.annotation.Nonnull Pet pet) throws WebClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new WebClientResponseException("Missing the required parameter 'pet' when calling addPet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -81,7 +80,7 @@ private ResponseSpec addPetRequestCreation(@javax.annotation.Nonnull Pet pet) th String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -235,23 +234,24 @@ public ResponseSpec deletePetWithResponseSpec(DeletePetRequest requestParameters * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deletePetRequestCreation(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String apiKey) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling deletePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); + + if (apiKey != null) { + headerParams.add("api_key", apiClient.parameterToString(apiKey)); + } - if (apiKey != null) - headerParams.add("api_key", apiClient.parameterToString(apiKey)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -260,7 +260,7 @@ private ResponseSpec deletePetRequestCreation(@javax.annotation.Nonnull Long pet String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -315,18 +315,17 @@ public ResponseSpec deletePetWithResponseSpec(@javax.annotation.Nonnull Long pet * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec findPetsByStatusRequestCreation(@javax.annotation.Nonnull List status) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'status' is set if (status == null) { throw new WebClientResponseException("Missing the required parameter 'status' when calling findPetsByStatus", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); @@ -340,7 +339,7 @@ private ResponseSpec findPetsByStatusRequestCreation(@javax.annotation.Nonnull L String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -396,18 +395,17 @@ public ResponseSpec findPetsByStatusWithResponseSpec(@javax.annotation.Nonnull L */ @Deprecated private ResponseSpec findPetsByTagsRequestCreation(@javax.annotation.Nonnull Set tags) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'tags' is set if (tags == null) { throw new WebClientResponseException("Missing the required parameter 'tags' when calling findPetsByTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); @@ -421,7 +419,7 @@ private ResponseSpec findPetsByTagsRequestCreation(@javax.annotation.Nonnull Set String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -482,20 +480,19 @@ public ResponseSpec findPetsByTagsWithResponseSpec(@javax.annotation.Nonnull Set * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getPetByIdRequestCreation(@javax.annotation.Nonnull Long petId) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling getPetById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -507,7 +504,7 @@ private ResponseSpec getPetByIdRequestCreation(@javax.annotation.Nonnull Long pe String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -565,18 +562,17 @@ public ResponseSpec getPetByIdWithResponseSpec(@javax.annotation.Nonnull Long pe * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetRequestCreation(@javax.annotation.Nonnull Pet pet) throws WebClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new WebClientResponseException("Missing the required parameter 'pet' when calling updatePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -588,7 +584,7 @@ private ResponseSpec updatePetRequestCreation(@javax.annotation.Nonnull Pet pet) String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -761,25 +757,26 @@ public ResponseSpec updatePetWithFormWithResponseSpec(UpdatePetWithFormRequest r * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetWithFormRequestCreation(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String name, @javax.annotation.Nullable String status) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling updatePetWithForm", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (name != null) + if (name != null) { formParams.add("name", name); - if (status != null) + } + if (status != null) { formParams.add("status", status); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -791,7 +788,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@javax.annotation.Nonnull String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -963,25 +960,26 @@ public ResponseSpec uploadFileWithResponseSpec(UploadFileRequest requestParamete * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileRequestCreation(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String additionalMetadata, @javax.annotation.Nullable File _file) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling uploadFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (_file != null) + } + if (_file != null) { formParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { "application/json" @@ -995,7 +993,7 @@ private ResponseSpec uploadFileRequestCreation(@javax.annotation.Nonnull Long pe String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1166,7 +1164,6 @@ public ResponseSpec uploadFileWithRequiredFileWithResponseSpec(UploadFileWithReq * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@javax.annotation.Nonnull Long petId, @javax.annotation.Nonnull File requiredFile, @javax.annotation.Nullable String additionalMetadata) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling uploadFileWithRequiredFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1176,19 +1173,19 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@javax.annotation throw new WebClientResponseException("Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (requiredFile != null) - formParams.add("requiredFile", new FileSystemResource(requiredFile)); + } + formParams.add("requiredFile", new FileSystemResource(requiredFile)); final String[] localVarAccepts = { "application/json" @@ -1202,7 +1199,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@javax.annotation String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java index f7d1a89132ec..bd1155c32ec9 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java @@ -55,20 +55,19 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteOrderRequestCreation(@javax.annotation.Nonnull String orderId) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new WebClientResponseException("Missing the required parameter 'orderId' when calling deleteOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("order_id", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -78,7 +77,7 @@ private ResponseSpec deleteOrderRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -128,14 +127,13 @@ public ResponseSpec deleteOrderWithResponseSpec(@javax.annotation.Nonnull String * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -147,7 +145,7 @@ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseExcep String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -196,20 +194,19 @@ public ResponseSpec getInventoryWithResponseSpec() throws WebClientResponseExcep * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getOrderByIdRequestCreation(@javax.annotation.Nonnull Long orderId) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new WebClientResponseException("Missing the required parameter 'orderId' when calling getOrderById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("order_id", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -221,7 +218,7 @@ private ResponseSpec getOrderByIdRequestCreation(@javax.annotation.Nonnull Long String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -278,18 +275,17 @@ public ResponseSpec getOrderByIdWithResponseSpec(@javax.annotation.Nonnull Long * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec placeOrderRequestCreation(@javax.annotation.Nonnull Order order) throws WebClientResponseException { - Object postBody = order; // verify the required parameter 'order' is set if (order == null) { throw new WebClientResponseException("Missing the required parameter 'order' when calling placeOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -303,7 +299,7 @@ private ResponseSpec placeOrderRequestCreation(@javax.annotation.Nonnull Order o String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, order, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java index c4319559ec4c..3e109a8fe7b1 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java @@ -55,18 +55,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUserRequestCreation(@javax.annotation.Nonnull User user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new WebClientResponseException("Missing the required parameter 'user' when calling createUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -78,7 +77,7 @@ private ResponseSpec createUserRequestCreation(@javax.annotation.Nonnull User us String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -125,18 +124,17 @@ public ResponseSpec createUserWithResponseSpec(@javax.annotation.Nonnull User us * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithArrayInputRequestCreation(@javax.annotation.Nonnull List user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new WebClientResponseException("Missing the required parameter 'user' when calling createUsersWithArrayInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -148,7 +146,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@javax.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -195,18 +193,17 @@ public ResponseSpec createUsersWithArrayInputWithResponseSpec(@javax.annotation. * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithListInputRequestCreation(@javax.annotation.Nonnull List user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new WebClientResponseException("Missing the required parameter 'user' when calling createUsersWithListInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -218,7 +215,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -266,20 +263,19 @@ public ResponseSpec createUsersWithListInputWithResponseSpec(@javax.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteUserRequestCreation(@javax.annotation.Nonnull String username) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling deleteUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -289,7 +285,7 @@ private ResponseSpec deleteUserRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -342,20 +338,19 @@ public ResponseSpec deleteUserWithResponseSpec(@javax.annotation.Nonnull String * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getUserByNameRequestCreation(@javax.annotation.Nonnull String username) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling getUserByName", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -367,7 +362,7 @@ private ResponseSpec getUserByNameRequestCreation(@javax.annotation.Nonnull Stri String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -529,7 +524,6 @@ public ResponseSpec loginUserWithResponseSpec(LoginUserRequest requestParameters * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec loginUserRequestCreation(@javax.annotation.Nonnull String username, @javax.annotation.Nonnull String password) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling loginUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -539,12 +533,12 @@ private ResponseSpec loginUserRequestCreation(@javax.annotation.Nonnull String u throw new WebClientResponseException("Missing the required parameter 'password' when calling loginUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); @@ -559,7 +553,7 @@ private ResponseSpec loginUserRequestCreation(@javax.annotation.Nonnull String u String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -613,14 +607,13 @@ public ResponseSpec loginUserWithResponseSpec(@javax.annotation.Nonnull String u * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -630,7 +623,7 @@ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseExcepti String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -778,7 +771,6 @@ public ResponseSpec updateUserWithResponseSpec(UpdateUserRequest requestParamete * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String username, @javax.annotation.Nonnull User user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling updateUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -788,14 +780,14 @@ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String throw new WebClientResponseException("Missing the required parameter 'user' when calling updateUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -807,7 +799,7 @@ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index a23c5980ed10..c509265b5b86 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -55,18 +55,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec call123testSpecialTagsRequestCreation(@javax.annotation.Nonnull Client client) throws WebClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new WebClientResponseException("Missing the required parameter 'client' when calling call123testSpecialTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -80,7 +79,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/DefaultApi.java index 481a9082f9f9..390814e30c58 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -54,14 +54,13 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -73,7 +72,7 @@ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java index d45f4d9092b4..7d84ae82c6e0 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java @@ -68,14 +68,13 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -87,7 +86,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponse String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -133,14 +132,13 @@ public ResponseSpec fakeBigDecimalMapWithResponseSpec() throws WebClientResponse * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -152,7 +150,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseExce String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -200,23 +198,24 @@ public ResponseSpec fakeHealthGetWithResponseSpec() throws WebClientResponseExce * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeHttpSignatureTestRequestCreation(@javax.annotation.Nonnull Pet pet, @javax.annotation.Nullable String query1, @javax.annotation.Nullable String header1) throws WebClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new WebClientResponseException("Missing the required parameter 'pet' when calling fakeHttpSignatureTest", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); - if (header1 != null) - headerParams.add("header_1", apiClient.parameterToString(header1)); + if (header1 != null) { + headerParams.add("header_1", apiClient.parameterToString(header1)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { @@ -227,7 +226,7 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@javax.annotation.Nonn String[] localVarAuthNames = new String[] { "http_signature_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -281,14 +280,13 @@ public ResponseSpec fakeHttpSignatureTestWithResponseSpec(@javax.annotation.Nonn * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@javax.annotation.Nullable Boolean body) throws WebClientResponseException { - Object postBody = body; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -302,7 +300,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@javax.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -352,14 +350,13 @@ public ResponseSpec fakeOuterBooleanSerializeWithResponseSpec(@javax.annotation. * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@javax.annotation.Nullable OuterComposite outerComposite) throws WebClientResponseException { - Object postBody = outerComposite; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -373,7 +370,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@javax.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, outerComposite, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -423,14 +420,13 @@ public ResponseSpec fakeOuterCompositeSerializeWithResponseSpec(@javax.annotatio * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@javax.annotation.Nullable BigDecimal body) throws WebClientResponseException { - Object postBody = body; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -444,7 +440,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -494,14 +490,13 @@ public ResponseSpec fakeOuterNumberSerializeWithResponseSpec(@javax.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakeOuterStringSerializeRequestCreation(@javax.annotation.Nullable String body) throws WebClientResponseException { - Object postBody = body; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -515,7 +510,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -565,18 +560,17 @@ public ResponseSpec fakeOuterStringSerializeWithResponseSpec(@javax.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@javax.annotation.Nonnull OuterObjectWithEnumProperty outerObjectWithEnumProperty) throws WebClientResponseException { - Object postBody = outerObjectWithEnumProperty; // verify the required parameter 'outerObjectWithEnumProperty' is set if (outerObjectWithEnumProperty == null) { throw new WebClientResponseException("Missing the required parameter 'outerObjectWithEnumProperty' when calling fakePropertyEnumIntegerSerialize", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "*/*" @@ -590,7 +584,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@javax.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, outerObjectWithEnumProperty, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -639,18 +633,17 @@ public ResponseSpec fakePropertyEnumIntegerSerializeWithResponseSpec(@javax.anno * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@javax.annotation.Nonnull Map requestBody) throws WebClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new WebClientResponseException("Missing the required parameter 'requestBody' when calling testAdditionalPropertiesReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -662,7 +655,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@javax.ann String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -709,18 +702,17 @@ public ResponseSpec testAdditionalPropertiesReferenceWithResponseSpec(@javax.ann * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithBinaryRequestCreation(@javax.annotation.Nullable File body) throws WebClientResponseException { - Object postBody = body; // verify the required parameter 'body' is set if (body == null) { throw new WebClientResponseException("Missing the required parameter 'body' when calling testBodyWithBinary", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -732,7 +724,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@javax.annotation.Nullabl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, body, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -779,18 +771,17 @@ public ResponseSpec testBodyWithBinaryWithResponseSpec(@javax.annotation.Nullabl * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithFileSchemaRequestCreation(@javax.annotation.Nonnull FileSchemaTestClass fileSchemaTestClass) throws WebClientResponseException { - Object postBody = fileSchemaTestClass; // verify the required parameter 'fileSchemaTestClass' is set if (fileSchemaTestClass == null) { throw new WebClientResponseException("Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -802,7 +793,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, fileSchemaTestClass, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -850,7 +841,6 @@ public ResponseSpec testBodyWithFileSchemaWithResponseSpec(@javax.annotation.Non * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testBodyWithQueryParamsRequestCreation(@javax.annotation.Nonnull String query, @javax.annotation.Nonnull User user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'query' is set if (query == null) { throw new WebClientResponseException("Missing the required parameter 'query' when calling testBodyWithQueryParams", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -860,12 +850,12 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@javax.annotation.No throw new WebClientResponseException("Missing the required parameter 'user' when calling testBodyWithQueryParams", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); @@ -879,7 +869,7 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@javax.annotation.No String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -930,18 +920,17 @@ public ResponseSpec testBodyWithQueryParamsWithResponseSpec(@javax.annotation.No * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClientModelRequestCreation(@javax.annotation.Nonnull Client client) throws WebClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new WebClientResponseException("Missing the required parameter 'client' when calling testClientModel", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -955,7 +944,7 @@ private ResponseSpec testClientModelRequestCreation(@javax.annotation.Nonnull Cl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1018,7 +1007,6 @@ public ResponseSpec testClientModelWithResponseSpec(@javax.annotation.Nonnull Cl * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEndpointParametersRequestCreation(@javax.annotation.Nonnull BigDecimal number, @javax.annotation.Nonnull Double _double, @javax.annotation.Nonnull String patternWithoutDelimiter, @javax.annotation.Nonnull byte[] _byte, @javax.annotation.Nullable Integer integer, @javax.annotation.Nullable Integer int32, @javax.annotation.Nullable Long int64, @javax.annotation.Nullable Float _float, @javax.annotation.Nullable String string, @javax.annotation.Nullable File binary, @javax.annotation.Nullable LocalDate date, @javax.annotation.Nullable OffsetDateTime dateTime, @javax.annotation.Nullable String password, @javax.annotation.Nullable String paramCallback) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'number' is set if (number == null) { throw new WebClientResponseException("Missing the required parameter 'number' when calling testEndpointParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1036,41 +1024,47 @@ private ResponseSpec testEndpointParametersRequestCreation(@javax.annotation.Non throw new WebClientResponseException("Missing the required parameter '_byte' when calling testEndpointParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (integer != null) + if (integer != null) { formParams.add("integer", integer); - if (int32 != null) + } + if (int32 != null) { formParams.add("int32", int32); - if (int64 != null) + } + if (int64 != null) { formParams.add("int64", int64); - if (number != null) - formParams.add("number", number); - if (_float != null) + } + formParams.add("number", number); + if (_float != null) { formParams.add("float", _float); - if (_double != null) - formParams.add("double", _double); - if (string != null) + } + formParams.add("double", _double); + if (string != null) { formParams.add("string", string); - if (patternWithoutDelimiter != null) - formParams.add("pattern_without_delimiter", patternWithoutDelimiter); - if (_byte != null) - formParams.add("byte", _byte); - if (binary != null) + } + formParams.add("pattern_without_delimiter", patternWithoutDelimiter); + formParams.add("byte", _byte); + if (binary != null) { formParams.add("binary", new FileSystemResource(binary)); - if (date != null) + } + if (date != null) { formParams.add("date", date); - if (dateTime != null) + } + if (dateTime != null) { formParams.add("dateTime", dateTime); - if (password != null) + } + if (password != null) { formParams.add("password", password); - if (paramCallback != null) + } + if (paramCallback != null) { formParams.add("callback", paramCallback); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1082,7 +1076,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { "http_basic_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1180,14 +1174,13 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@javax.annotation.Non * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString)); @@ -1195,14 +1188,19 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); - if (enumHeaderStringArray != null) - headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); - if (enumHeaderString != null) - headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); - if (enumFormStringArray != null) + if (enumHeaderStringArray != null) { + headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); + } + if (enumHeaderString != null) { + headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + } + + if (enumFormStringArray != null) { formParams.addAll("enum_form_string_array", enumFormStringArray); - if (enumFormString != null) + } + if (enumFormString != null) { formParams.add("enum_form_string", enumFormString); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1214,7 +1212,7 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1293,7 +1291,6 @@ public ResponseSpec testEnumParametersWithResponseSpec(@javax.annotation.Nullabl * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnull Integer requiredStringGroup, @javax.annotation.Nonnull Boolean requiredBooleanGroup, @javax.annotation.Nonnull Long requiredInt64Group, @javax.annotation.Nullable Integer stringGroup, @javax.annotation.Nullable Boolean booleanGroup, @javax.annotation.Nullable Long int64Group) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'requiredStringGroup' is set if (requiredStringGroup == null) { throw new WebClientResponseException("Missing the required parameter 'requiredStringGroup' when calling testGroupParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1307,22 +1304,23 @@ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnul throw new WebClientResponseException("Missing the required parameter 'requiredInt64Group' when calling testGroupParameters", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); - if (requiredBooleanGroup != null) headerParams.add("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup)); - if (booleanGroup != null) - headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + if (booleanGroup != null) { + headerParams.add("boolean_group", apiClient.parameterToString(booleanGroup)); + } + final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -1331,7 +1329,7 @@ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnul String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1393,18 +1391,17 @@ public ResponseSpec testGroupParametersWithResponseSpec(@javax.annotation.Nonnul * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@javax.annotation.Nonnull Map requestBody) throws WebClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new WebClientResponseException("Missing the required parameter 'requestBody' when calling testInlineAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1416,7 +1413,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@javax.annota String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1463,18 +1460,17 @@ public ResponseSpec testInlineAdditionalPropertiesWithResponseSpec(@javax.annota * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@javax.annotation.Nonnull TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest) throws WebClientResponseException { - Object postBody = testInlineFreeformAdditionalPropertiesRequest; // verify the required parameter 'testInlineFreeformAdditionalPropertiesRequest' is set if (testInlineFreeformAdditionalPropertiesRequest == null) { throw new WebClientResponseException("Missing the required parameter 'testInlineFreeformAdditionalPropertiesRequest' when calling testInlineFreeformAdditionalProperties", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1486,7 +1482,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@java String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, testInlineFreeformAdditionalPropertiesRequest, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1534,7 +1530,6 @@ public ResponseSpec testInlineFreeformAdditionalPropertiesWithResponseSpec(@java * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull String param, @javax.annotation.Nonnull String param2) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'param' is set if (param == null) { throw new WebClientResponseException("Missing the required parameter 'param' when calling testJsonFormData", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1544,17 +1539,15 @@ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull S throw new WebClientResponseException("Missing the required parameter 'param2' when calling testJsonFormData", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (param != null) - formParams.add("param", param); - if (param2 != null) - formParams.add("param2", param2); + formParams.add("param", param); + formParams.add("param2", param2); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1566,7 +1559,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull S String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1616,18 +1609,17 @@ public ResponseSpec testJsonFormDataWithResponseSpec(@javax.annotation.Nonnull S * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testNullableRequestCreation(@javax.annotation.Nonnull ChildWithNullable childWithNullable) throws WebClientResponseException { - Object postBody = childWithNullable; // verify the required parameter 'childWithNullable' is set if (childWithNullable == null) { throw new WebClientResponseException("Missing the required parameter 'childWithNullable' when calling testNullable", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1639,7 +1631,7 @@ private ResponseSpec testNullableRequestCreation(@javax.annotation.Nonnull Child String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, childWithNullable, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1692,7 +1684,6 @@ public ResponseSpec testNullableWithResponseSpec(@javax.annotation.Nonnull Child * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.annotation.Nonnull List pipe, @javax.annotation.Nonnull List ioutil, @javax.annotation.Nonnull List http, @javax.annotation.Nonnull List url, @javax.annotation.Nonnull List context, @javax.annotation.Nonnull String allowEmpty, @javax.annotation.Nullable Map language) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'pipe' is set if (pipe == null) { throw new WebClientResponseException("Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -1718,12 +1709,12 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.an throw new WebClientResponseException("Missing the required parameter 'allowEmpty' when calling testQueryParameterCollectionFormat", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("pipes".toUpperCase(Locale.ROOT)), "pipe", pipe)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil)); @@ -1741,7 +1732,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1806,18 +1797,17 @@ public ResponseSpec testQueryParameterCollectionFormatWithResponseSpec(@javax.an * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testStringMapReferenceRequestCreation(@javax.annotation.Nonnull Map requestBody) throws WebClientResponseException { - Object postBody = requestBody; // verify the required parameter 'requestBody' is set if (requestBody == null) { throw new WebClientResponseException("Missing the required parameter 'requestBody' when calling testStringMapReference", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1829,7 +1819,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, requestBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 4b8ed0a8b8fd..7f4238f69d37 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -55,18 +55,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec testClassnameRequestCreation(@javax.annotation.Nonnull Client client) throws WebClientResponseException { - Object postBody = client; // verify the required parameter 'client' is set if (client == null) { throw new WebClientResponseException("Missing the required parameter 'client' when calling testClassname", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -80,7 +79,7 @@ private ResponseSpec testClassnameRequestCreation(@javax.annotation.Nonnull Clie String[] localVarAuthNames = new String[] { "api_key_query" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, client, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java index 232aba5307e8..134353ba2b00 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java @@ -58,18 +58,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec addPetRequestCreation(@javax.annotation.Nonnull Pet pet) throws WebClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new WebClientResponseException("Missing the required parameter 'pet' when calling addPet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -81,7 +80,7 @@ private ResponseSpec addPetRequestCreation(@javax.annotation.Nonnull Pet pet) th String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -133,23 +132,24 @@ public ResponseSpec addPetWithResponseSpec(@javax.annotation.Nonnull Pet pet) th * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deletePetRequestCreation(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String apiKey) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling deletePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); + + if (apiKey != null) { + headerParams.add("api_key", apiClient.parameterToString(apiKey)); + } - if (apiKey != null) - headerParams.add("api_key", apiClient.parameterToString(apiKey)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); final String[] localVarContentTypes = { }; @@ -158,7 +158,7 @@ private ResponseSpec deletePetRequestCreation(@javax.annotation.Nonnull Long pet String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -213,18 +213,17 @@ public ResponseSpec deletePetWithResponseSpec(@javax.annotation.Nonnull Long pet * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec findPetsByStatusRequestCreation(@javax.annotation.Nonnull List status) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'status' is set if (status == null) { throw new WebClientResponseException("Missing the required parameter 'status' when calling findPetsByStatus", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); @@ -238,7 +237,7 @@ private ResponseSpec findPetsByStatusRequestCreation(@javax.annotation.Nonnull L String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -294,18 +293,17 @@ public ResponseSpec findPetsByStatusWithResponseSpec(@javax.annotation.Nonnull L */ @Deprecated private ResponseSpec findPetsByTagsRequestCreation(@javax.annotation.Nonnull Set tags) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'tags' is set if (tags == null) { throw new WebClientResponseException("Missing the required parameter 'tags' when calling findPetsByTags", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); @@ -319,7 +317,7 @@ private ResponseSpec findPetsByTagsRequestCreation(@javax.annotation.Nonnull Set String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -380,20 +378,19 @@ public ResponseSpec findPetsByTagsWithResponseSpec(@javax.annotation.Nonnull Set * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getPetByIdRequestCreation(@javax.annotation.Nonnull Long petId) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling getPetById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -405,7 +402,7 @@ private ResponseSpec getPetByIdRequestCreation(@javax.annotation.Nonnull Long pe String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -463,18 +460,17 @@ public ResponseSpec getPetByIdWithResponseSpec(@javax.annotation.Nonnull Long pe * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetRequestCreation(@javax.annotation.Nonnull Pet pet) throws WebClientResponseException { - Object postBody = pet; // verify the required parameter 'pet' is set if (pet == null) { throw new WebClientResponseException("Missing the required parameter 'pet' when calling updatePet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -486,7 +482,7 @@ private ResponseSpec updatePetRequestCreation(@javax.annotation.Nonnull Pet pet) String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, pet, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -545,25 +541,26 @@ public ResponseSpec updatePetWithResponseSpec(@javax.annotation.Nonnull Pet pet) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updatePetWithFormRequestCreation(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String name, @javax.annotation.Nullable String status) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling updatePetWithForm", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (name != null) + if (name != null) { formParams.add("name", name); - if (status != null) + } + if (status != null) { formParams.add("status", status); + } final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -575,7 +572,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@javax.annotation.Nonnull String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -634,25 +631,26 @@ public ResponseSpec updatePetWithFormWithResponseSpec(@javax.annotation.Nonnull * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileRequestCreation(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String additionalMetadata, @javax.annotation.Nullable File _file) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling uploadFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (_file != null) + } + if (_file != null) { formParams.add("file", new FileSystemResource(_file)); + } final String[] localVarAccepts = { "application/json" @@ -666,7 +664,7 @@ private ResponseSpec uploadFileRequestCreation(@javax.annotation.Nonnull Long pe String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -724,7 +722,6 @@ public ResponseSpec uploadFileWithResponseSpec(@javax.annotation.Nonnull Long pe * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@javax.annotation.Nonnull Long petId, @javax.annotation.Nonnull File requiredFile, @javax.annotation.Nullable String additionalMetadata) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'petId' is set if (petId == null) { throw new WebClientResponseException("Missing the required parameter 'petId' when calling uploadFileWithRequiredFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -734,19 +731,19 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@javax.annotation throw new WebClientResponseException("Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("petId", petId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); - if (additionalMetadata != null) + if (additionalMetadata != null) { formParams.add("additionalMetadata", additionalMetadata); - if (requiredFile != null) - formParams.add("requiredFile", new FileSystemResource(requiredFile)); + } + formParams.add("requiredFile", new FileSystemResource(requiredFile)); final String[] localVarAccepts = { "application/json" @@ -760,7 +757,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@javax.annotation String[] localVarAuthNames = new String[] { "petstore_auth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java index f7d1a89132ec..bd1155c32ec9 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/StoreApi.java @@ -55,20 +55,19 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteOrderRequestCreation(@javax.annotation.Nonnull String orderId) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new WebClientResponseException("Missing the required parameter 'orderId' when calling deleteOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("order_id", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -78,7 +77,7 @@ private ResponseSpec deleteOrderRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -128,14 +127,13 @@ public ResponseSpec deleteOrderWithResponseSpec(@javax.annotation.Nonnull String * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/json" @@ -147,7 +145,7 @@ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseExcep String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -196,20 +194,19 @@ public ResponseSpec getInventoryWithResponseSpec() throws WebClientResponseExcep * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getOrderByIdRequestCreation(@javax.annotation.Nonnull Long orderId) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'orderId' is set if (orderId == null) { throw new WebClientResponseException("Missing the required parameter 'orderId' when calling getOrderById", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("order_id", orderId); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -221,7 +218,7 @@ private ResponseSpec getOrderByIdRequestCreation(@javax.annotation.Nonnull Long String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -278,18 +275,17 @@ public ResponseSpec getOrderByIdWithResponseSpec(@javax.annotation.Nonnull Long * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec placeOrderRequestCreation(@javax.annotation.Nonnull Order order) throws WebClientResponseException { - Object postBody = order; // verify the required parameter 'order' is set if (order == null) { throw new WebClientResponseException("Missing the required parameter 'order' when calling placeOrder", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -303,7 +299,7 @@ private ResponseSpec placeOrderRequestCreation(@javax.annotation.Nonnull Order o String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, order, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java index ec1593a3fa8f..ef59f43778fb 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/UserApi.java @@ -55,18 +55,17 @@ public void setApiClient(ApiClient apiClient) { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUserRequestCreation(@javax.annotation.Nonnull User user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new WebClientResponseException("Missing the required parameter 'user' when calling createUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -78,7 +77,7 @@ private ResponseSpec createUserRequestCreation(@javax.annotation.Nonnull User us String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -125,18 +124,17 @@ public ResponseSpec createUserWithResponseSpec(@javax.annotation.Nonnull User us * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithArrayInputRequestCreation(@javax.annotation.Nonnull List user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new WebClientResponseException("Missing the required parameter 'user' when calling createUsersWithArrayInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -148,7 +146,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@javax.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -195,18 +193,17 @@ public ResponseSpec createUsersWithArrayInputWithResponseSpec(@javax.annotation. * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec createUsersWithListInputRequestCreation(@javax.annotation.Nonnull List user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'user' is set if (user == null) { throw new WebClientResponseException("Missing the required parameter 'user' when calling createUsersWithListInput", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -218,7 +215,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -266,20 +263,19 @@ public ResponseSpec createUsersWithListInputWithResponseSpec(@javax.annotation.N * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec deleteUserRequestCreation(@javax.annotation.Nonnull String username) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling deleteUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -289,7 +285,7 @@ private ResponseSpec deleteUserRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -342,20 +338,19 @@ public ResponseSpec deleteUserWithResponseSpec(@javax.annotation.Nonnull String * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec getUserByNameRequestCreation(@javax.annotation.Nonnull String username) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling getUserByName", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { "application/xml", "application/json" @@ -367,7 +362,7 @@ private ResponseSpec getUserByNameRequestCreation(@javax.annotation.Nonnull Stri String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -425,7 +420,6 @@ public ResponseSpec getUserByNameWithResponseSpec(@javax.annotation.Nonnull Stri * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec loginUserRequestCreation(@javax.annotation.Nonnull String username, @javax.annotation.Nonnull String password) throws WebClientResponseException { - Object postBody = null; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling loginUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -435,12 +429,12 @@ private ResponseSpec loginUserRequestCreation(@javax.annotation.Nonnull String u throw new WebClientResponseException("Missing the required parameter 'password' when calling loginUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); @@ -455,7 +449,7 @@ private ResponseSpec loginUserRequestCreation(@javax.annotation.Nonnull String u String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -509,14 +503,13 @@ public ResponseSpec loginUserWithResponseSpec(@javax.annotation.Nonnull String u * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseException { - Object postBody = null; // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -526,7 +519,7 @@ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseExcepti String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, null, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -572,7 +565,6 @@ public ResponseSpec logoutUserWithResponseSpec() throws WebClientResponseExcepti * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String username, @javax.annotation.Nonnull User user) throws WebClientResponseException { - Object postBody = user; // verify the required parameter 'username' is set if (username == null) { throw new WebClientResponseException("Missing the required parameter 'username' when calling updateUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); @@ -582,14 +574,14 @@ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String throw new WebClientResponseException("Missing the required parameter 'user' when calling updateUser", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); } // create path and map variables - final Map pathParams = new HashMap(); + final Map pathParams = new HashMap<>(); pathParams.put("username", username); - final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); - final MultiValueMap cookieParams = new LinkedMultiValueMap(); - final MultiValueMap formParams = new LinkedMultiValueMap(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -601,7 +593,7 @@ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, user, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /**