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 48f7beb1ea4b..a56461f5f0a2 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 @@ -102,7 +102,7 @@ public class {{classname}} { {{/pathParams}} {{/hasPathParams}} - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -110,23 +110,23 @@ public class {{classname}} { {{#queryParams}} {{#queryIsJsonMimeType}} - queryParams.putAll(apiClient.parameterToMultiValueMapJson({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}})); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMapJson({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}})); {{/queryIsJsonMimeType}} {{^queryIsJsonMimeType}} {{#isExplode}} {{#hasVars}} if ({{paramName}} != null) { {{#vars}} - queryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}}.{{getter}}())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}}.{{getter}}())); {{/vars}} } {{/hasVars}} {{^hasVars}} - queryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}})); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}})); {{/hasVars}} {{/isExplode}} {{^isExplode}} - queryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}})); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}})); {{/isExplode}} {{/queryIsJsonMimeType}} {{/queryParams}} @@ -165,7 +165,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("{{{path}}}", HttpMethod.{{httpMethod}}, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** 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 8d06f6fe6fe9..0fc3fa589d44 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 @@ -104,7 +104,7 @@ public class {{classname}} { {{/pathParams}} {{/hasPathParams}} - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -112,21 +112,21 @@ public class {{classname}} { {{#queryParams}} {{#queryIsJsonMimeType}} - queryParams.putAll(apiClient.parameterToMultiValueMapJson({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}})); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMapJson({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}})); {{/queryIsJsonMimeType}} {{^queryIsJsonMimeType}} {{#isExplode}} {{#hasVars}} {{#vars}} - queryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}}.{{getter}}())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}}.{{getter}}())); {{/vars}} {{/hasVars}} {{^hasVars}} - queryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}})); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}})); {{/hasVars}} {{/isExplode}} {{^isExplode}} - queryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}})); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{.}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}})); {{/isExplode}} {{/queryIsJsonMimeType}} {{/queryParams}} @@ -165,7 +165,7 @@ 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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("{{{path}}}", HttpMethod.{{httpMethod}}, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** 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 2fc1135296a5..66e59ffbbcf8 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 @@ -2105,16 +2105,16 @@ public void shouldProperlyExplodeWebClientQueryParameters() { .printFileContent() .assertMethod("searchRequestCreation") .bodyContainsLines( - "queryParams.putAll(apiClient.parameterToMultiValueMap(null, \"regular-param\"," + "localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, \"regular-param\"," + " regularParam));") .bodyContainsLines( - "queryParams.putAll(apiClient.parameterToMultiValueMap(null, \"someString\"," + "localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, \"someString\"," + " objectParam.getSomeString()));") .bodyContainsLines( - "queryParams.putAll(apiClient.parameterToMultiValueMap(null, \"someBoolean\"," + "localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, \"someBoolean\"," + " objectParam.getSomeBoolean()));") .bodyContainsLines( - "queryParams.putAll(apiClient.parameterToMultiValueMap(null, \"someInteger\"," + "localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, \"someInteger\"," + " objectParam.getSomeInteger()));"); } @@ -4248,11 +4248,11 @@ public void queryParameterJsonSerialization(String library) { new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); assertFileContains( output.resolve("src/main/java/org/openapitools/client/api/QueryApi.java"), - "queryParams.putAll(apiClient.parameterToMultiValueMapJson(null, \"json_serialized_object_ref_string_query\", jsonSerializedObjectRefStringQuery));" + "localVarQueryParams.putAll(apiClient.parameterToMultiValueMapJson(null, \"json_serialized_object_ref_string_query\", jsonSerializedObjectRefStringQuery));" ); assertFileContains( output.resolve("src/main/java/org/openapitools/client/api/QueryApi.java"), - "queryParams.putAll(apiClient.parameterToMultiValueMapJson(ApiClient.CollectionFormat" + + "localVarQueryParams.putAll(apiClient.parameterToMultiValueMapJson(ApiClient.CollectionFormat" + ".valueOf(\"csv\".toUpperCase(Locale.ROOT)), \"json_serialized_object_array_ref_string_query\", jsonSerializedObjectArrayRefStringQuery));" ); } 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 14669156032c..1b54cc0e6d81 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 @@ -55,7 +55,7 @@ private ResponseSpec testAuthHttpBasicRequestCreation() throws RestClientRespons // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -70,7 +70,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/auth/http/basic", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -120,7 +120,7 @@ private ResponseSpec testAuthHttpBearerRequestCreation() throws RestClientRespon // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -135,7 +135,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/auth/http/bearer", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 bc3c154f0e7b..9aa9ba2e039c 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 @@ -59,7 +59,7 @@ private ResponseSpec testBinaryGifRequestCreation() throws RestClientResponseExc // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -74,7 +74,7 @@ private ResponseSpec testBinaryGifRequestCreation() throws RestClientResponseExc String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/binary/gif", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/binary/gif", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -125,7 +125,7 @@ private ResponseSpec testBodyApplicationOctetstreamBinaryRequestCreation(@jakart // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -142,7 +142,7 @@ private ResponseSpec testBodyApplicationOctetstreamBinaryRequestCreation(@jakart String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/body/application/octetstream/binary", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/body/application/octetstream/binary", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -200,7 +200,7 @@ private ResponseSpec testBodyMultipartFormdataArrayOfBinaryRequestCreation(@jaka // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -220,7 +220,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/body/application/octetstream/array_of_binary", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -274,7 +274,7 @@ private ResponseSpec testBodyMultipartFormdataSingleBinaryRequestCreation(@jakar // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -294,7 +294,7 @@ private ResponseSpec testBodyMultipartFormdataSingleBinaryRequestCreation(@jakar String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/body/application/octetstream/single_binary", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/body/application/octetstream/single_binary", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -348,7 +348,7 @@ private ResponseSpec testEchoBodyAllOfPetRequestCreation(@jakarta.annotation.Nul // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -365,7 +365,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/echo/body/allOf/Pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -419,7 +419,7 @@ private ResponseSpec testEchoBodyFreeFormObjectResponseStringRequestCreation(@ja // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -436,7 +436,7 @@ private ResponseSpec testEchoBodyFreeFormObjectResponseStringRequestCreation(@ja String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/echo/body/FreeFormObject/response_string", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/echo/body/FreeFormObject/response_string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -490,7 +490,7 @@ private ResponseSpec testEchoBodyPetRequestCreation(@jakarta.annotation.Nullable // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -507,7 +507,7 @@ private ResponseSpec testEchoBodyPetRequestCreation(@jakarta.annotation.Nullable String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/echo/body/Pet", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/echo/body/Pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -561,7 +561,7 @@ private ResponseSpec testEchoBodyPetResponseStringRequestCreation(@jakarta.annot // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -578,7 +578,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/echo/body/Pet/response_string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -632,7 +632,7 @@ private ResponseSpec testEchoBodyStringEnumRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -649,7 +649,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/echo/body/string_enum", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -703,7 +703,7 @@ private ResponseSpec testEchoBodyTagResponseStringRequestCreation(@jakarta.annot // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -720,7 +720,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/echo/body/Tag/response_string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 ef8a3aacf72e..0d9a5dbfe12c 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 @@ -59,7 +59,7 @@ private ResponseSpec testFormIntegerBooleanStringRequestCreation(@jakarta.annota // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -83,7 +83,7 @@ private ResponseSpec testFormIntegerBooleanStringRequestCreation(@jakarta.annota String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/form/integer/boolean/string", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/form/integer/boolean/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -147,7 +147,7 @@ private ResponseSpec testFormObjectMultipartRequestCreation(@jakarta.annotation. // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/form/object/multipart", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -226,7 +226,7 @@ private ResponseSpec testFormOneofRequestCreation(@jakarta.annotation.Nullable S // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -256,7 +256,7 @@ private ResponseSpec testFormOneofRequestCreation(@jakarta.annotation.Nullable S String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/form/oneof", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/form/oneof", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 690fd819f773..ee4154bcc8d3 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 @@ -61,7 +61,7 @@ private ResponseSpec testHeaderIntegerBooleanStringEnumsRequestCreation(@jakarta // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -86,7 +86,7 @@ private ResponseSpec testHeaderIntegerBooleanStringEnumsRequestCreation(@jakarta String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/header/integer/boolean/string/enums", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/header/integer/boolean/string/enums", HttpMethod.GET, pathParams, localVarQueryParams, postBody, 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 b35465fb1bef..3de52d0b8594 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 @@ -81,7 +81,7 @@ private ResponseSpec testsPathStringPathStringIntegerPathIntegerEnumNonrefString pathParams.put("enum_nonref_string_path", enumNonrefStringPath); pathParams.put("enum_ref_string_path", enumRefStringPath); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -96,7 +96,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, queryParams, 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, postBody, 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 5c99742f99ad..162b8eba980d 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 @@ -64,13 +64,13 @@ private ResponseSpec testEnumRefStringRequestCreation(@jakarta.annotation.Nullab // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_nonref_string_query", enumNonrefStringQuery)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_ref_string_query", enumRefStringQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_nonref_string_query", enumNonrefStringQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_ref_string_query", enumRefStringQuery)); final String[] localVarAccepts = { "text/plain" @@ -82,7 +82,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/enum_ref_string", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -141,14 +141,14 @@ private ResponseSpec testQueryDatetimeDateStringRequestCreation(@jakarta.annotat // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "datetime_query", datetimeQuery)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "date_query", dateQuery)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_query", stringQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "datetime_query", datetimeQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "date_query", dateQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_query", stringQuery)); final String[] localVarAccepts = { "text/plain" @@ -160,7 +160,7 @@ private ResponseSpec testQueryDatetimeDateStringRequestCreation(@jakarta.annotat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/query/datetime/date/string", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/datetime/date/string", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -222,14 +222,14 @@ private ResponseSpec testQueryIntegerBooleanStringRequestCreation(@jakarta.annot // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "integer_query", integerQuery)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "boolean_query", booleanQuery)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_query", stringQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "integer_query", integerQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "boolean_query", booleanQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_query", stringQuery)); final String[] localVarAccepts = { "text/plain" @@ -241,7 +241,7 @@ private ResponseSpec testQueryIntegerBooleanStringRequestCreation(@jakarta.annot String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/query/integer/boolean/string", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/integer/boolean/string", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -301,18 +301,18 @@ private ResponseSpec testQueryStyleDeepObjectExplodeTrueObjectRequestCreation(@j // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); if (queryObject != null) { - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "id", queryObject.getId())); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "name", queryObject.getName())); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "category", queryObject.getCategory())); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "photoUrls", queryObject.getPhotoUrls())); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "tags", queryObject.getTags())); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "status", queryObject.getStatus())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "id", queryObject.getId())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "name", queryObject.getName())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "category", queryObject.getCategory())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "photoUrls", queryObject.getPhotoUrls())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "tags", queryObject.getTags())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "status", queryObject.getStatus())); } final String[] localVarAccepts = { @@ -325,7 +325,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_deepObject/explode_true/object", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -379,12 +379,12 @@ private ResponseSpec testQueryStyleDeepObjectExplodeTrueObjectAllOfRequestCreati // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_object", queryObject)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_object", queryObject)); final String[] localVarAccepts = { "text/plain" @@ -396,7 +396,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_deepObject/explode_true/object/allOf", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -450,12 +450,12 @@ private ResponseSpec testQueryStyleFormExplodeFalseArrayIntegerRequestCreation(@ // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "query_object", queryObject)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "query_object", queryObject)); final String[] localVarAccepts = { "text/plain" @@ -467,7 +467,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_form/explode_false/array_integer", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -521,12 +521,12 @@ private ResponseSpec testQueryStyleFormExplodeFalseArrayStringRequestCreation(@j // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "query_object", queryObject)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "query_object", queryObject)); final String[] localVarAccepts = { "text/plain" @@ -538,7 +538,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_form/explode_false/array_string", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -592,13 +592,13 @@ private ResponseSpec testQueryStyleFormExplodeTrueArrayStringRequestCreation(@ja // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); if (queryObject != null) { - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "values", queryObject.getValues())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "values", queryObject.getValues())); } final String[] localVarAccepts = { @@ -611,7 +611,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_form/explode_true/array_string", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -665,18 +665,18 @@ private ResponseSpec testQueryStyleFormExplodeTrueObjectRequestCreation(@jakarta // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); if (queryObject != null) { - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "id", queryObject.getId())); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "name", queryObject.getName())); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "category", queryObject.getCategory())); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "photoUrls", queryObject.getPhotoUrls())); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "tags", queryObject.getTags())); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "status", queryObject.getStatus())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "id", queryObject.getId())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "name", queryObject.getName())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "category", queryObject.getCategory())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "photoUrls", queryObject.getPhotoUrls())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "tags", queryObject.getTags())); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "status", queryObject.getStatus())); } final String[] localVarAccepts = { @@ -689,7 +689,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_form/explode_true/object", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -743,12 +743,12 @@ private ResponseSpec testQueryStyleFormExplodeTrueObjectAllOfRequestCreation(@ja // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_object", queryObject)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_object", queryObject)); final String[] localVarAccepts = { "text/plain" @@ -760,7 +760,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_form/explode_true/object/allOf", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -815,13 +815,13 @@ private ResponseSpec testQueryStyleJsonSerializationObjectRequestCreation(@jakar // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMapJson(null, "json_serialized_object_ref_string_query", jsonSerializedObjectRefStringQuery)); - queryParams.putAll(apiClient.parameterToMultiValueMapJson(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "json_serialized_object_array_ref_string_query", jsonSerializedObjectArrayRefStringQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMapJson(null, "json_serialized_object_ref_string_query", jsonSerializedObjectRefStringQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMapJson(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "json_serialized_object_array_ref_string_query", jsonSerializedObjectArrayRefStringQuery)); final String[] localVarAccepts = { "text/plain" @@ -833,7 +833,7 @@ private ResponseSpec testQueryStyleJsonSerializationObjectRequestCreation(@jakar String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/query/style_jsonSerialization/object", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/query/style_jsonSerialization/object", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** 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 96b987a50495..1c43db00907f 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 @@ -79,7 +79,7 @@ private ResponseSpec createMessageRequestCreation(@jakarta.annotation.Nonnull Fi // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -105,7 +105,7 @@ private ResponseSpec createMessageRequestCreation(@jakarta.annotation.Nonnull Fi String[] localVarAuthNames = new String[] { "basicAuth" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/messages", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/messages", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 1b7b42fcf6fb..1e713a07f423 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 @@ -62,7 +62,7 @@ private ResponseSpec createBarRequestCreation(@jakarta.annotation.Nonnull BarCre // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -79,7 +79,7 @@ private ResponseSpec createBarRequestCreation(@jakarta.annotation.Nonnull BarCre String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/bar", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/bar", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 bb0301747246..d4b4c408dbe8 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 @@ -58,7 +58,7 @@ private ResponseSpec createFooRequestCreation(@jakarta.annotation.Nullable Foo f // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -75,7 +75,7 @@ private ResponseSpec createFooRequestCreation(@jakarta.annotation.Nullable Foo f String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/foo", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -128,7 +128,7 @@ private ResponseSpec getAllFoosRequestCreation() throws RestClientResponseExcept // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -143,7 +143,7 @@ private ResponseSpec getAllFoosRequestCreation() throws RestClientResponseExcept String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, 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 fb2b9877de2c..5c20d6f2289f 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 @@ -56,7 +56,7 @@ private ResponseSpec resourceInResponseRequestCreation() throws RestClientRespon // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -71,7 +71,7 @@ private ResponseSpec resourceInResponseRequestCreation() throws RestClientRespon String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/resource", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/resource", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** 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 d3ef1f9c4ad2..ac525e1e9d09 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 @@ -64,7 +64,7 @@ private ResponseSpec createBarRequestCreation(@javax.annotation.Nonnull BarCreat // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -81,7 +81,7 @@ private ResponseSpec createBarRequestCreation(@javax.annotation.Nonnull BarCreat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/bar", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/bar", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, 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 049245cd80b6..e526f1d1bbfd 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 @@ -60,7 +60,7 @@ private ResponseSpec createFooRequestCreation(@javax.annotation.Nullable Foo foo // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -77,7 +77,7 @@ private ResponseSpec createFooRequestCreation(@javax.annotation.Nullable Foo foo String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -130,7 +130,7 @@ private ResponseSpec getAllFoosRequestCreation() throws WebClientResponseExcepti // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -145,7 +145,7 @@ private ResponseSpec getAllFoosRequestCreation() throws WebClientResponseExcepti String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, 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 d3ef1f9c4ad2..ac525e1e9d09 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 @@ -64,7 +64,7 @@ private ResponseSpec createBarRequestCreation(@javax.annotation.Nonnull BarCreat // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -81,7 +81,7 @@ private ResponseSpec createBarRequestCreation(@javax.annotation.Nonnull BarCreat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/bar", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/bar", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, 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 049245cd80b6..e526f1d1bbfd 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 @@ -60,7 +60,7 @@ private ResponseSpec createFooRequestCreation(@javax.annotation.Nullable Foo foo // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -77,7 +77,7 @@ private ResponseSpec createFooRequestCreation(@javax.annotation.Nullable Foo foo String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -130,7 +130,7 @@ private ResponseSpec getAllFoosRequestCreation() throws WebClientResponseExcepti // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -145,7 +145,7 @@ private ResponseSpec getAllFoosRequestCreation() throws WebClientResponseExcepti String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, 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 1db4da6cdd87..36544d84f408 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 @@ -58,7 +58,7 @@ private ResponseSpec resourceInResponseRequestCreation() throws WebClientRespons // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -73,7 +73,7 @@ private ResponseSpec resourceInResponseRequestCreation() throws WebClientRespons String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/resource", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/resource", HttpMethod.GET, pathParams, localVarQueryParams, postBody, 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 144e4187ca0d..bf23f54000e9 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 @@ -56,7 +56,7 @@ private ResponseSpec nullableArrayTestGetRequestCreation() throws RestClientResp // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -71,7 +71,7 @@ private ResponseSpec nullableArrayTestGetRequestCreation() throws RestClientResp String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/nullable-array-test", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/nullable-array-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, 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 24dbd29514e7..6d8cdd86b8a3 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 @@ -62,7 +62,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -79,7 +79,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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/DefaultApi.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java index accb19c454aa..6cc36c86c8a5 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -65,7 +65,7 @@ private ResponseSpec fileIdGetRequestCreation(String id) throws RestClientRespon pathParams.put("id", id); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -78,7 +78,7 @@ private ResponseSpec fileIdGetRequestCreation(String id) throws RestClientRespon String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/file/{id}", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/file/{id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -134,12 +134,12 @@ private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dt pathParams.put("dtParam", dtParam); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "dtQuery", dtQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "dtQuery", dtQuery)); cookieParams.putAll(apiClient.parameterToMultiValueMap(null, "dtCookie", dtCookie)); @@ -153,7 +153,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo/{dtParam}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -212,7 +212,7 @@ private ResponseSpec uploadPostRequestCreation(@Nullable File _file) throws Rest // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -230,7 +230,7 @@ private ResponseSpec uploadPostRequestCreation(@Nullable File _file) throws Rest String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/upload", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/upload", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 24dbd29514e7..6d8cdd86b8a3 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 @@ -62,7 +62,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -79,7 +79,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 49e83164399d..2f60ebfa92fe 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 @@ -61,7 +61,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -78,7 +78,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, 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 15ee21527102..491fabe7d824 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 @@ -56,7 +56,7 @@ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -71,7 +71,7 @@ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, 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 91ac811e9fec..b7d0fe91f6a3 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 @@ -70,7 +70,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientRespons // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -85,7 +85,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientRespons String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -135,7 +135,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseExc // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -150,7 +150,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseExc String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -206,12 +206,12 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); if (header1 != null) headerParams.add("header_1", apiClient.parameterToString(header1)); @@ -225,7 +225,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -283,7 +283,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -300,7 +300,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -354,7 +354,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -371,7 +371,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -425,7 +425,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -442,7 +442,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -496,7 +496,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -513,7 +513,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -571,7 +571,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -588,7 +588,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -645,7 +645,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -660,7 +660,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -715,7 +715,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nulla // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -730,7 +730,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -785,7 +785,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -800,7 +800,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -860,12 +860,12 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation. // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -877,7 +877,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -936,7 +936,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -953,7 +953,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1036,7 +1036,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1080,7 +1080,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1182,16 +1182,16 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); + 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)); @@ -1212,7 +1212,7 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1307,15 +1307,15 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); + 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)); @@ -1329,7 +1329,7 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1399,7 +1399,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1414,7 +1414,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1469,7 +1469,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1484,7 +1484,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1544,7 +1544,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1564,7 +1564,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1622,7 +1622,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1637,7 +1637,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1718,18 +1718,18 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("pipes".toUpperCase(Locale.ROOT)), "pipe", pipe)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1739,7 +1739,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1812,7 +1812,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1827,7 +1827,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 d29a29a897f2..5ff7accf3580 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 @@ -61,7 +61,7 @@ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Cl // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -78,7 +78,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, 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 4b7ba2dc65da..e3c8efa4bca2 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 @@ -64,7 +64,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -79,7 +79,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -141,7 +141,7 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -219,12 +219,12 @@ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -236,7 +236,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -300,12 +300,12 @@ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull S // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -317,7 +317,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -382,7 +382,7 @@ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -397,7 +397,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -463,7 +463,7 @@ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pe // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -478,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -547,7 +547,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -567,7 +567,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -636,7 +636,7 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -658,7 +658,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -730,7 +730,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -752,7 +752,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 5a1ab4b5146a..a12c998f4a1e 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 @@ -63,7 +63,7 @@ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull Stri pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -76,7 +76,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -130,7 +130,7 @@ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseExce // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -145,7 +145,7 @@ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseExce String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -204,7 +204,7 @@ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Lon pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -219,7 +219,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -284,7 +284,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -301,7 +301,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 3d6709a91321..617676c24094 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 @@ -61,7 +61,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -76,7 +76,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -131,7 +131,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -146,7 +146,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -201,7 +201,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -216,7 +216,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -274,7 +274,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -287,7 +287,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -350,7 +350,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -365,7 +365,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -435,13 +435,13 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -453,7 +453,7 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -511,7 +511,7 @@ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseExcept // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -524,7 +524,7 @@ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseExcept String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -584,7 +584,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -599,7 +599,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, 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 49e83164399d..2f60ebfa92fe 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 @@ -61,7 +61,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -78,7 +78,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, 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 15ee21527102..491fabe7d824 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 @@ -56,7 +56,7 @@ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -71,7 +71,7 @@ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, 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 8bfb9fd0778e..e8b0d973a841 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 @@ -70,7 +70,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientRespons // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -85,7 +85,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientRespons String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -135,7 +135,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseExc // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -150,7 +150,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseExc String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -297,12 +297,12 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); if (header1 != null) headerParams.add("header_1", apiClient.parameterToString(header1)); @@ -316,7 +316,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -374,7 +374,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -391,7 +391,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -445,7 +445,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -462,7 +462,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -516,7 +516,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -533,7 +533,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -587,7 +587,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -604,7 +604,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -662,7 +662,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -679,7 +679,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -736,7 +736,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -751,7 +751,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -806,7 +806,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nulla // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -821,7 +821,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -876,7 +876,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -891,7 +891,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1031,12 +1031,12 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation. // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1048,7 +1048,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1107,7 +1107,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1124,7 +1124,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1422,7 +1422,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1466,7 +1466,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1728,16 +1728,16 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); + 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)); @@ -1758,7 +1758,7 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1977,15 +1977,15 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); + 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)); @@ -1999,7 +1999,7 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2069,7 +2069,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -2084,7 +2084,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2139,7 +2139,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -2154,7 +2154,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2294,7 +2294,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -2314,7 +2314,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2372,7 +2372,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -2387,7 +2387,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2603,18 +2603,18 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("pipes".toUpperCase(Locale.ROOT)), "pipe", pipe)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -2624,7 +2624,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2697,7 +2697,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -2712,7 +2712,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 d29a29a897f2..5ff7accf3580 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 @@ -61,7 +61,7 @@ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Cl // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -78,7 +78,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, 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 2abcd342adb8..fc2be0aaecb7 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 @@ -64,7 +64,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -79,7 +79,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -224,7 +224,7 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -239,7 +239,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -302,12 +302,12 @@ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -319,7 +319,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -383,12 +383,12 @@ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull S // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -400,7 +400,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -465,7 +465,7 @@ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -480,7 +480,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -546,7 +546,7 @@ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pe // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -561,7 +561,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -724,7 +724,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -744,7 +744,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -906,7 +906,7 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -928,7 +928,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1093,7 +1093,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1115,7 +1115,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 5a1ab4b5146a..a12c998f4a1e 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 @@ -63,7 +63,7 @@ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull Stri pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -76,7 +76,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -130,7 +130,7 @@ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseExce // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -145,7 +145,7 @@ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseExce String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -204,7 +204,7 @@ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Lon pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -219,7 +219,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -284,7 +284,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -301,7 +301,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 8969cf538240..3a8ee337b80b 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 @@ -61,7 +61,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -76,7 +76,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -131,7 +131,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -146,7 +146,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -201,7 +201,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -216,7 +216,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -274,7 +274,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -287,7 +287,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -350,7 +350,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -365,7 +365,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -520,13 +520,13 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -538,7 +538,7 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -596,7 +596,7 @@ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseExcept // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -609,7 +609,7 @@ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseExcept String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -752,7 +752,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -767,7 +767,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, 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 49e83164399d..2f60ebfa92fe 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 @@ -61,7 +61,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -78,7 +78,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, 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 15ee21527102..491fabe7d824 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 @@ -56,7 +56,7 @@ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -71,7 +71,7 @@ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, 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 7e7cc9bcbef8..2fdc48375216 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 @@ -70,7 +70,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientRespons // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -85,7 +85,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientRespons String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -135,7 +135,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseExc // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -150,7 +150,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseExc String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -242,12 +242,12 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); if (header1 != null) headerParams.add("header_1", apiClient.parameterToString(header1)); @@ -261,7 +261,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -319,7 +319,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -336,7 +336,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -390,7 +390,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -407,7 +407,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -461,7 +461,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -478,7 +478,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -532,7 +532,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -549,7 +549,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -607,7 +607,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -624,7 +624,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -681,7 +681,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -696,7 +696,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -751,7 +751,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nulla // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -766,7 +766,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -821,7 +821,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -836,7 +836,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -932,12 +932,12 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation. // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -949,7 +949,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1008,7 +1008,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1025,7 +1025,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1147,7 +1147,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1191,7 +1191,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1332,16 +1332,16 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); + 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)); @@ -1362,7 +1362,7 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1493,15 +1493,15 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); + 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)); @@ -1515,7 +1515,7 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1585,7 +1585,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1600,7 +1600,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1655,7 +1655,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1670,7 +1670,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1766,7 +1766,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1786,7 +1786,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1844,7 +1844,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1859,7 +1859,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1976,18 +1976,18 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("pipes".toUpperCase(Locale.ROOT)), "pipe", pipe)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1997,7 +1997,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2070,7 +2070,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -2085,7 +2085,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 d29a29a897f2..5ff7accf3580 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 @@ -61,7 +61,7 @@ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Cl // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -78,7 +78,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, 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 97c3ad4fb525..e010ba2e4c90 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 @@ -64,7 +64,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -79,7 +79,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -180,7 +180,7 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -258,12 +258,12 @@ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -275,7 +275,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -339,12 +339,12 @@ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull S // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -356,7 +356,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -421,7 +421,7 @@ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -436,7 +436,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -502,7 +502,7 @@ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pe // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -517,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -625,7 +625,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -645,7 +645,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -752,7 +752,7 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -774,7 +774,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -884,7 +884,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -906,7 +906,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 5a1ab4b5146a..a12c998f4a1e 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 @@ -63,7 +63,7 @@ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull Stri pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -76,7 +76,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -130,7 +130,7 @@ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseExce // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -145,7 +145,7 @@ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseExce String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -204,7 +204,7 @@ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Lon pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -219,7 +219,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -284,7 +284,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -301,7 +301,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 7b12c432eebe..c0dccb5a30d2 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 @@ -61,7 +61,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -76,7 +76,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -131,7 +131,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -146,7 +146,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -201,7 +201,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -216,7 +216,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -274,7 +274,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -287,7 +287,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -350,7 +350,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -365,7 +365,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -476,13 +476,13 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -494,7 +494,7 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -552,7 +552,7 @@ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseExcept // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -565,7 +565,7 @@ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseExcept String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -664,7 +664,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -679,7 +679,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, 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 49e83164399d..2f60ebfa92fe 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 @@ -61,7 +61,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -78,7 +78,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, 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 15ee21527102..491fabe7d824 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 @@ -56,7 +56,7 @@ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -71,7 +71,7 @@ private ResponseSpec fooGetRequestCreation() throws RestClientResponseException String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, 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 91ac811e9fec..b7d0fe91f6a3 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 @@ -70,7 +70,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientRespons // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -85,7 +85,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws RestClientRespons String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -135,7 +135,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseExc // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -150,7 +150,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws RestClientResponseExc String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -206,12 +206,12 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); if (header1 != null) headerParams.add("header_1", apiClient.parameterToString(header1)); @@ -225,7 +225,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -283,7 +283,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -300,7 +300,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -354,7 +354,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -371,7 +371,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -425,7 +425,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -442,7 +442,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -496,7 +496,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -513,7 +513,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -571,7 +571,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -588,7 +588,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -645,7 +645,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -660,7 +660,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -715,7 +715,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nulla // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -730,7 +730,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -785,7 +785,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -800,7 +800,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -860,12 +860,12 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation. // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -877,7 +877,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -936,7 +936,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -953,7 +953,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1036,7 +1036,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1080,7 +1080,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1182,16 +1182,16 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); + 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)); @@ -1212,7 +1212,7 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1307,15 +1307,15 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); + 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)); @@ -1329,7 +1329,7 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1399,7 +1399,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1414,7 +1414,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1469,7 +1469,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1484,7 +1484,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1544,7 +1544,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1564,7 +1564,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1622,7 +1622,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1637,7 +1637,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1718,18 +1718,18 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("pipes".toUpperCase(Locale.ROOT)), "pipe", pipe)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1739,7 +1739,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1812,7 +1812,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -1827,7 +1827,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 d29a29a897f2..5ff7accf3580 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 @@ -61,7 +61,7 @@ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Cl // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -78,7 +78,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, 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 4b7ba2dc65da..e3c8efa4bca2 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 @@ -64,7 +64,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -79,7 +79,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -141,7 +141,7 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -219,12 +219,12 @@ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -236,7 +236,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -300,12 +300,12 @@ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull S // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -317,7 +317,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -382,7 +382,7 @@ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -397,7 +397,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -463,7 +463,7 @@ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pe // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -478,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -547,7 +547,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -567,7 +567,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -636,7 +636,7 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -658,7 +658,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -730,7 +730,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -752,7 +752,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 5a1ab4b5146a..a12c998f4a1e 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 @@ -63,7 +63,7 @@ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull Stri pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -76,7 +76,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -130,7 +130,7 @@ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseExce // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -145,7 +145,7 @@ private ResponseSpec getInventoryRequestCreation() throws RestClientResponseExce String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -204,7 +204,7 @@ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Lon pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -219,7 +219,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -284,7 +284,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -301,7 +301,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 3d6709a91321..617676c24094 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 @@ -61,7 +61,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -76,7 +76,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -131,7 +131,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -146,7 +146,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -201,7 +201,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -216,7 +216,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -274,7 +274,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -287,7 +287,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -350,7 +350,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -365,7 +365,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -435,13 +435,13 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -453,7 +453,7 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -511,7 +511,7 @@ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseExcept // create path and map variables final Map pathParams = new HashMap<>(); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -524,7 +524,7 @@ private ResponseSpec logoutUserRequestCreation() throws RestClientResponseExcept String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -584,7 +584,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap<>(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); final MultiValueMap formParams = new LinkedMultiValueMap<>(); @@ -599,7 +599,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** 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 986348bd803d..c32142241638 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 @@ -63,7 +63,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -80,7 +80,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, 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 5276aeaea167..ae4b6be44369 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 @@ -58,7 +58,7 @@ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -73,7 +73,7 @@ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, 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 9f2a28e83cea..bff8939e693d 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 @@ -72,7 +72,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponse // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -87,7 +87,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponse String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -137,7 +137,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseExce // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -152,7 +152,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseExce String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -208,12 +208,12 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@jakarta.annotation.No // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); if (header1 != null) headerParams.add("header_1", apiClient.parameterToString(header1)); @@ -227,7 +227,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -285,7 +285,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -302,7 +302,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -356,7 +356,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -373,7 +373,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@jakarta.annotat String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -427,7 +427,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -444,7 +444,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -498,7 +498,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -515,7 +515,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -573,7 +573,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -590,7 +590,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@jakarta.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -647,7 +647,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -662,7 +662,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@jakarta.a String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -717,7 +717,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@jakarta.annotation.Nulla // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -732,7 +732,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -787,7 +787,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -802,7 +802,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -862,12 +862,12 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@jakarta.annotation. // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -879,7 +879,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -938,7 +938,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -955,7 +955,7 @@ private ResponseSpec testClientModelRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1038,7 +1038,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1082,7 +1082,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1184,16 +1184,16 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); + 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)); @@ -1214,7 +1214,7 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1309,15 +1309,15 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); + 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)); @@ -1331,7 +1331,7 @@ private ResponseSpec testGroupParametersRequestCreation(@jakarta.annotation.Nonn String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1401,7 +1401,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1416,7 +1416,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@jakarta.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1471,7 +1471,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1486,7 +1486,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@jaka String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1546,7 +1546,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1566,7 +1566,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@jakarta.annotation.Nonnull String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1624,7 +1624,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1639,7 +1639,7 @@ private ResponseSpec testNullableRequestCreation(@jakarta.annotation.Nonnull Chi String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1720,18 +1720,18 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("pipes".toUpperCase(Locale.ROOT)), "pipe", pipe)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1741,7 +1741,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@jakarta. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1814,7 +1814,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1829,7 +1829,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@jakarta.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, 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 833605e55e3d..d8f892b6774a 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 @@ -63,7 +63,7 @@ private ResponseSpec testClassnameRequestCreation(@jakarta.annotation.Nonnull Cl // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -80,7 +80,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, 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 2f67371d9b71..5b7e2bed6fa5 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 @@ -66,7 +66,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -81,7 +81,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -143,7 +143,7 @@ private ResponseSpec deletePetRequestCreation(@jakarta.annotation.Nonnull Long p pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -158,7 +158,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -221,12 +221,12 @@ private ResponseSpec findPetsByStatusRequestCreation(@jakarta.annotation.Nonnull // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -238,7 +238,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -302,12 +302,12 @@ private ResponseSpec findPetsByTagsRequestCreation(@jakarta.annotation.Nonnull S // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -319,7 +319,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -386,7 +386,7 @@ private ResponseSpec getPetByIdRequestCreation(@jakarta.annotation.Nonnull Long pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -401,7 +401,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -467,7 +467,7 @@ private ResponseSpec updatePetRequestCreation(@jakarta.annotation.Nonnull Pet pe // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -482,7 +482,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -551,7 +551,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@jakarta.annotation.Nonnul pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -571,7 +571,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -640,7 +640,7 @@ private ResponseSpec uploadFileRequestCreation(@jakarta.annotation.Nonnull Long pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -662,7 +662,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -734,7 +734,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@jakarta.annotati pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -756,7 +756,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, 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 0cb1a6ea0a0c..c6b787c58ff1 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 @@ -65,7 +65,7 @@ private ResponseSpec deleteOrderRequestCreation(@jakarta.annotation.Nonnull Stri pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -78,7 +78,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -132,7 +132,7 @@ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseExcep // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -147,7 +147,7 @@ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseExcep String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -206,7 +206,7 @@ private ResponseSpec getOrderByIdRequestCreation(@jakarta.annotation.Nonnull Lon pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -221,7 +221,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -286,7 +286,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -303,7 +303,7 @@ private ResponseSpec placeOrderRequestCreation(@jakarta.annotation.Nonnull Order String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, 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 1e5b5ea8c87e..d3aad0687d59 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 @@ -63,7 +63,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -78,7 +78,7 @@ private ResponseSpec createUserRequestCreation(@jakarta.annotation.Nonnull User String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -133,7 +133,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -148,7 +148,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@jakarta.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -203,7 +203,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -218,7 +218,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@jakarta.annotation String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -276,7 +276,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -289,7 +289,7 @@ private ResponseSpec deleteUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -352,7 +352,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -367,7 +367,7 @@ private ResponseSpec getUserByNameRequestCreation(@jakarta.annotation.Nonnull St String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -437,13 +437,13 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -455,7 +455,7 @@ private ResponseSpec loginUserRequestCreation(@jakarta.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -513,7 +513,7 @@ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseExcepti // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -526,7 +526,7 @@ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseExcepti String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -586,7 +586,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -601,7 +601,7 @@ private ResponseSpec updateUserRequestCreation(@jakarta.annotation.Nonnull Strin String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, 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 5364116f9fc3..43aae8078d2b 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 @@ -58,7 +58,7 @@ private ResponseSpec nullableArrayTestGetRequestCreation() throws WebClientRespo // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -73,7 +73,7 @@ private ResponseSpec nullableArrayTestGetRequestCreation() throws WebClientRespo String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/nullable-array-test", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/nullable-array-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, 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/DefaultApi.java b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java index d0909a3f6ca4..033769356c99 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -67,7 +67,7 @@ private ResponseSpec fileIdGetRequestCreation(String id) throws WebClientRespons pathParams.put("id", id); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -80,7 +80,7 @@ private ResponseSpec fileIdGetRequestCreation(String id) throws WebClientRespons String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/file/{id}", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/file/{id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -136,12 +136,12 @@ private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dt pathParams.put("dtParam", dtParam); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "dtQuery", dtQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "dtQuery", dtQuery)); cookieParams.putAll(apiClient.parameterToMultiValueMap(null, "dtCookie", dtCookie)); @@ -155,7 +155,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo/{dtParam}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -214,7 +214,7 @@ private ResponseSpec uploadPostRequestCreation(@Nullable File _file) throws WebC // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -232,7 +232,7 @@ private ResponseSpec uploadPostRequestCreation(@Nullable File _file) throws WebC String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/upload", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/upload", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, 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 b354acf1d806..eff162db73a9 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 @@ -64,7 +64,7 @@ private ResponseSpec addPetRequestCreation(@jakarta.annotation.Nonnull Pet pet) // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -81,7 +81,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, 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 055978df18ff..8072865fdd69 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 @@ -63,7 +63,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@javax.annotation.Non // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -80,7 +80,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, 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 d2af4044e5c9..7fd8c7c9dce0 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 @@ -58,7 +58,7 @@ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -73,7 +73,7 @@ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, 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 3c6ca184103e..f348cf3181fa 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 @@ -72,7 +72,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponse // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -87,7 +87,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponse String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -137,7 +137,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseExce // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -152,7 +152,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseExce String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -208,12 +208,12 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@javax.annotation.Nonn // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); if (header1 != null) headerParams.add("header_1", apiClient.parameterToString(header1)); @@ -227,7 +227,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -285,7 +285,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@javax.annotation. // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -302,7 +302,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@javax.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -356,7 +356,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@javax.annotatio // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -373,7 +373,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@javax.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -427,7 +427,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@javax.annotation.N // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -444,7 +444,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -498,7 +498,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@javax.annotation.N // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -515,7 +515,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -573,7 +573,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@javax.anno // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -590,7 +590,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@javax.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -647,7 +647,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@javax.ann // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -662,7 +662,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@javax.ann String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -717,7 +717,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@javax.annotation.Nullabl // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -732,7 +732,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -787,7 +787,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@javax.annotation.Non // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -802,7 +802,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -862,12 +862,12 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@javax.annotation.No // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -879,7 +879,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -938,7 +938,7 @@ private ResponseSpec testClientModelRequestCreation(@javax.annotation.Nonnull Cl // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -955,7 +955,7 @@ private ResponseSpec testClientModelRequestCreation(@javax.annotation.Nonnull Cl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1038,7 +1038,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@javax.annotation.Non // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1082,7 +1082,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1184,16 +1184,16 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); + 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)); @@ -1214,7 +1214,7 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1309,15 +1309,15 @@ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnul // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); + 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)); @@ -1331,7 +1331,7 @@ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnul String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1401,7 +1401,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@javax.annota // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1416,7 +1416,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@javax.annota String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1471,7 +1471,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@java // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1486,7 +1486,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@java String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1546,7 +1546,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull S // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1566,7 +1566,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull S String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1624,7 +1624,7 @@ private ResponseSpec testNullableRequestCreation(@javax.annotation.Nonnull Child // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1639,7 +1639,7 @@ private ResponseSpec testNullableRequestCreation(@javax.annotation.Nonnull Child String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1720,18 +1720,18 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.an // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("pipes".toUpperCase(Locale.ROOT)), "pipe", pipe)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1741,7 +1741,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1814,7 +1814,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@javax.annotation.Non // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1829,7 +1829,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 3c48d12089f9..1d4913947097 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 @@ -63,7 +63,7 @@ private ResponseSpec testClassnameRequestCreation(@javax.annotation.Nonnull Clie // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -80,7 +80,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, 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 7ca839d9d393..09e33ad0061e 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 @@ -66,7 +66,7 @@ private ResponseSpec addPetRequestCreation(@javax.annotation.Nonnull Pet pet) th // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -81,7 +81,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -143,7 +143,7 @@ private ResponseSpec deletePetRequestCreation(@javax.annotation.Nonnull Long pet pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -221,12 +221,12 @@ private ResponseSpec findPetsByStatusRequestCreation(@javax.annotation.Nonnull L // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -238,7 +238,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -302,12 +302,12 @@ private ResponseSpec findPetsByTagsRequestCreation(@javax.annotation.Nonnull Set // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -319,7 +319,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -386,7 +386,7 @@ private ResponseSpec getPetByIdRequestCreation(@javax.annotation.Nonnull Long pe pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -401,7 +401,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -467,7 +467,7 @@ private ResponseSpec updatePetRequestCreation(@javax.annotation.Nonnull Pet pet) // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -482,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -551,7 +551,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@javax.annotation.Nonnull pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -571,7 +571,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -640,7 +640,7 @@ private ResponseSpec uploadFileRequestCreation(@javax.annotation.Nonnull Long pe pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -662,7 +662,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -734,7 +734,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@javax.annotation pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -756,7 +756,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 28b8a660b4fc..13a24800932d 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 @@ -65,7 +65,7 @@ private ResponseSpec deleteOrderRequestCreation(@javax.annotation.Nonnull String pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -78,7 +78,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -132,7 +132,7 @@ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseExcep // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -147,7 +147,7 @@ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseExcep String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -206,7 +206,7 @@ private ResponseSpec getOrderByIdRequestCreation(@javax.annotation.Nonnull Long pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -221,7 +221,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -286,7 +286,7 @@ private ResponseSpec placeOrderRequestCreation(@javax.annotation.Nonnull Order o // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -303,7 +303,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 edd1c9ffb751..60433c43e1ee 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 @@ -63,7 +63,7 @@ private ResponseSpec createUserRequestCreation(@javax.annotation.Nonnull User us // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -78,7 +78,7 @@ private ResponseSpec createUserRequestCreation(@javax.annotation.Nonnull User us String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -133,7 +133,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@javax.annotation. // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -148,7 +148,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@javax.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -203,7 +203,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@javax.annotation.N // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -218,7 +218,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -276,7 +276,7 @@ private ResponseSpec deleteUserRequestCreation(@javax.annotation.Nonnull String pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -289,7 +289,7 @@ private ResponseSpec deleteUserRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -352,7 +352,7 @@ private ResponseSpec getUserByNameRequestCreation(@javax.annotation.Nonnull Stri pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -367,7 +367,7 @@ private ResponseSpec getUserByNameRequestCreation(@javax.annotation.Nonnull Stri String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -437,13 +437,13 @@ private ResponseSpec loginUserRequestCreation(@javax.annotation.Nonnull String u // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -455,7 +455,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -513,7 +513,7 @@ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseExcepti // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -526,7 +526,7 @@ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseExcepti String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -586,7 +586,7 @@ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -601,7 +601,7 @@ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, 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 055978df18ff..8072865fdd69 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 @@ -63,7 +63,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@javax.annotation.Non // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -80,7 +80,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, 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 d2af4044e5c9..7fd8c7c9dce0 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 @@ -58,7 +58,7 @@ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -73,7 +73,7 @@ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, 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 d5dd28b6c4a3..c41965698626 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 @@ -72,7 +72,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponse // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -87,7 +87,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponse String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -137,7 +137,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseExce // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -152,7 +152,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseExce String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -300,12 +300,12 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@javax.annotation.Nonn // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); if (header1 != null) headerParams.add("header_1", apiClient.parameterToString(header1)); @@ -319,7 +319,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -377,7 +377,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@javax.annotation. // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -394,7 +394,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@javax.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -448,7 +448,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@javax.annotatio // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -465,7 +465,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@javax.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -519,7 +519,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@javax.annotation.N // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -536,7 +536,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -590,7 +590,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@javax.annotation.N // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -607,7 +607,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -665,7 +665,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@javax.anno // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -682,7 +682,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@javax.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -739,7 +739,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@javax.ann // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -754,7 +754,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@javax.ann String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -809,7 +809,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@javax.annotation.Nullabl // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -824,7 +824,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -879,7 +879,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@javax.annotation.Non // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -894,7 +894,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1035,12 +1035,12 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@javax.annotation.No // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1052,7 +1052,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1111,7 +1111,7 @@ private ResponseSpec testClientModelRequestCreation(@javax.annotation.Nonnull Cl // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1128,7 +1128,7 @@ private ResponseSpec testClientModelRequestCreation(@javax.annotation.Nonnull Cl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1427,7 +1427,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@javax.annotation.Non // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1471,7 +1471,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1734,16 +1734,16 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); + 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)); @@ -1764,7 +1764,7 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1984,15 +1984,15 @@ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnul // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); + 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)); @@ -2006,7 +2006,7 @@ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnul String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2076,7 +2076,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@javax.annota // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -2091,7 +2091,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@javax.annota String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2146,7 +2146,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@java // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -2161,7 +2161,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@java String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2302,7 +2302,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull S // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -2322,7 +2322,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull S String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2380,7 +2380,7 @@ private ResponseSpec testNullableRequestCreation(@javax.annotation.Nonnull Child // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -2395,7 +2395,7 @@ private ResponseSpec testNullableRequestCreation(@javax.annotation.Nonnull Child String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2612,18 +2612,18 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.an // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("pipes".toUpperCase(Locale.ROOT)), "pipe", pipe)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -2633,7 +2633,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -2706,7 +2706,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@javax.annotation.Non // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -2721,7 +2721,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 3c48d12089f9..1d4913947097 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 @@ -63,7 +63,7 @@ private ResponseSpec testClassnameRequestCreation(@javax.annotation.Nonnull Clie // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -80,7 +80,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, 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 78d839fe4c94..6a52042d039f 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 @@ -66,7 +66,7 @@ private ResponseSpec addPetRequestCreation(@javax.annotation.Nonnull Pet pet) th // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -81,7 +81,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -227,7 +227,7 @@ private ResponseSpec deletePetRequestCreation(@javax.annotation.Nonnull Long pet pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -242,7 +242,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -305,12 +305,12 @@ private ResponseSpec findPetsByStatusRequestCreation(@javax.annotation.Nonnull L // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -322,7 +322,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -386,12 +386,12 @@ private ResponseSpec findPetsByTagsRequestCreation(@javax.annotation.Nonnull Set // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -403,7 +403,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -470,7 +470,7 @@ private ResponseSpec getPetByIdRequestCreation(@javax.annotation.Nonnull Long pe pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -485,7 +485,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -551,7 +551,7 @@ private ResponseSpec updatePetRequestCreation(@javax.annotation.Nonnull Pet pet) // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -566,7 +566,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -730,7 +730,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@javax.annotation.Nonnull pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -750,7 +750,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -913,7 +913,7 @@ private ResponseSpec uploadFileRequestCreation(@javax.annotation.Nonnull Long pe pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -935,7 +935,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1101,7 +1101,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@javax.annotation pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1123,7 +1123,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 28b8a660b4fc..13a24800932d 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 @@ -65,7 +65,7 @@ private ResponseSpec deleteOrderRequestCreation(@javax.annotation.Nonnull String pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -78,7 +78,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -132,7 +132,7 @@ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseExcep // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -147,7 +147,7 @@ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseExcep String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -206,7 +206,7 @@ private ResponseSpec getOrderByIdRequestCreation(@javax.annotation.Nonnull Long pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -221,7 +221,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -286,7 +286,7 @@ private ResponseSpec placeOrderRequestCreation(@javax.annotation.Nonnull Order o // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -303,7 +303,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 5b32fda6d2bf..db0aad76878d 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 @@ -63,7 +63,7 @@ private ResponseSpec createUserRequestCreation(@javax.annotation.Nonnull User us // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -78,7 +78,7 @@ private ResponseSpec createUserRequestCreation(@javax.annotation.Nonnull User us String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -133,7 +133,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@javax.annotation. // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -148,7 +148,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@javax.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -203,7 +203,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@javax.annotation.N // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -218,7 +218,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -276,7 +276,7 @@ private ResponseSpec deleteUserRequestCreation(@javax.annotation.Nonnull String pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -289,7 +289,7 @@ private ResponseSpec deleteUserRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -352,7 +352,7 @@ private ResponseSpec getUserByNameRequestCreation(@javax.annotation.Nonnull Stri pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -367,7 +367,7 @@ private ResponseSpec getUserByNameRequestCreation(@javax.annotation.Nonnull Stri String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -523,13 +523,13 @@ private ResponseSpec loginUserRequestCreation(@javax.annotation.Nonnull String u // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -541,7 +541,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -599,7 +599,7 @@ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseExcepti // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -612,7 +612,7 @@ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseExcepti String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -756,7 +756,7 @@ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -771,7 +771,7 @@ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, 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 055978df18ff..8072865fdd69 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 @@ -63,7 +63,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@javax.annotation.Non // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -80,7 +80,7 @@ private ResponseSpec call123testSpecialTagsRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/another-fake/dummy", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, 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 d2af4044e5c9..7fd8c7c9dce0 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 @@ -58,7 +58,7 @@ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -73,7 +73,7 @@ private ResponseSpec fooGetRequestCreation() throws WebClientResponseException { String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, localVarQueryParams, postBody, 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 3c6ca184103e..f348cf3181fa 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 @@ -72,7 +72,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponse // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -87,7 +87,7 @@ private ResponseSpec fakeBigDecimalMapRequestCreation() throws WebClientResponse String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/BigDecimalMap", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -137,7 +137,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseExce // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -152,7 +152,7 @@ private ResponseSpec fakeHealthGetRequestCreation() throws WebClientResponseExce String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/health", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -208,12 +208,12 @@ private ResponseSpec fakeHttpSignatureTestRequestCreation(@javax.annotation.Nonn // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query_1", query1)); if (header1 != null) headerParams.add("header_1", apiClient.parameterToString(header1)); @@ -227,7 +227,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/http-signature-test", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -285,7 +285,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@javax.annotation. // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -302,7 +302,7 @@ private ResponseSpec fakeOuterBooleanSerializeRequestCreation(@javax.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/boolean", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -356,7 +356,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@javax.annotatio // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -373,7 +373,7 @@ private ResponseSpec fakeOuterCompositeSerializeRequestCreation(@javax.annotatio String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/composite", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -427,7 +427,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@javax.annotation.N // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -444,7 +444,7 @@ private ResponseSpec fakeOuterNumberSerializeRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/number", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -498,7 +498,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@javax.annotation.N // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -515,7 +515,7 @@ private ResponseSpec fakeOuterStringSerializeRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/outer/string", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -573,7 +573,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@javax.anno // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -590,7 +590,7 @@ private ResponseSpec fakePropertyEnumIntegerSerializeRequestCreation(@javax.anno String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/property/enum-int", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -647,7 +647,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@javax.ann // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -662,7 +662,7 @@ private ResponseSpec testAdditionalPropertiesReferenceRequestCreation(@javax.ann String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/additionalProperties-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -717,7 +717,7 @@ private ResponseSpec testBodyWithBinaryRequestCreation(@javax.annotation.Nullabl // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -732,7 +732,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-binary", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -787,7 +787,7 @@ private ResponseSpec testBodyWithFileSchemaRequestCreation(@javax.annotation.Non // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -802,7 +802,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-file-schema", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -862,12 +862,12 @@ private ResponseSpec testBodyWithQueryParamsRequestCreation(@javax.annotation.No // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -879,7 +879,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/body-with-query-params", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -938,7 +938,7 @@ private ResponseSpec testClientModelRequestCreation(@javax.annotation.Nonnull Cl // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -955,7 +955,7 @@ private ResponseSpec testClientModelRequestCreation(@javax.annotation.Nonnull Cl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1038,7 +1038,7 @@ private ResponseSpec testEndpointParametersRequestCreation(@javax.annotation.Non // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1082,7 +1082,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1184,16 +1184,16 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_double", enumQueryDouble)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "enum_query_model_array", enumQueryModelArray)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_integer", enumQueryInteger)); + 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)); @@ -1214,7 +1214,7 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1309,15 +1309,15 @@ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnul // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "string_group", stringGroup)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "int64_group", int64Group)); + 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)); @@ -1331,7 +1331,7 @@ private ResponseSpec testGroupParametersRequestCreation(@javax.annotation.Nonnul String[] localVarAuthNames = new String[] { "bearer_test" }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1401,7 +1401,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@javax.annota // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1416,7 +1416,7 @@ private ResponseSpec testInlineAdditionalPropertiesRequestCreation(@javax.annota String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1471,7 +1471,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@java // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1486,7 +1486,7 @@ private ResponseSpec testInlineFreeformAdditionalPropertiesRequestCreation(@java String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/inline-freeform-additionalProperties", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1546,7 +1546,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull S // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1566,7 +1566,7 @@ private ResponseSpec testJsonFormDataRequestCreation(@javax.annotation.Nonnull S String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/jsonFormData", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1624,7 +1624,7 @@ private ResponseSpec testNullableRequestCreation(@javax.annotation.Nonnull Child // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1639,7 +1639,7 @@ private ResponseSpec testNullableRequestCreation(@javax.annotation.Nonnull Child String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/nullable", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1720,18 +1720,18 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.an // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("pipes".toUpperCase(Locale.ROOT)), "pipe", pipe)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); + 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)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("ssv".toUpperCase(Locale.ROOT)), "http", http)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "url", url)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("multi".toUpperCase(Locale.ROOT)), "context", context)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "language", language)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "allowEmpty", allowEmpty)); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1741,7 +1741,7 @@ private ResponseSpec testQueryParameterCollectionFormatRequestCreation(@javax.an String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/test-query-parameters", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -1814,7 +1814,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@javax.annotation.Non // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -1829,7 +1829,7 @@ private ResponseSpec testStringMapReferenceRequestCreation(@javax.annotation.Non String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/stringMap-reference", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 3c48d12089f9..1d4913947097 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 @@ -63,7 +63,7 @@ private ResponseSpec testClassnameRequestCreation(@javax.annotation.Nonnull Clie // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -80,7 +80,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake_classname_test", HttpMethod.PATCH, pathParams, localVarQueryParams, postBody, 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 7ca839d9d393..09e33ad0061e 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 @@ -66,7 +66,7 @@ private ResponseSpec addPetRequestCreation(@javax.annotation.Nonnull Pet pet) th // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -81,7 +81,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -143,7 +143,7 @@ private ResponseSpec deletePetRequestCreation(@javax.annotation.Nonnull Long pet pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -221,12 +221,12 @@ private ResponseSpec findPetsByStatusRequestCreation(@javax.annotation.Nonnull L // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -238,7 +238,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByStatus", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -302,12 +302,12 @@ private ResponseSpec findPetsByTagsRequestCreation(@javax.annotation.Nonnull Set // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -319,7 +319,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/findByTags", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -386,7 +386,7 @@ private ResponseSpec getPetByIdRequestCreation(@javax.annotation.Nonnull Long pe pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -401,7 +401,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -467,7 +467,7 @@ private ResponseSpec updatePetRequestCreation(@javax.annotation.Nonnull Pet pet) // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -482,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -551,7 +551,7 @@ private ResponseSpec updatePetWithFormRequestCreation(@javax.annotation.Nonnull pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -571,7 +571,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -640,7 +640,7 @@ private ResponseSpec uploadFileRequestCreation(@javax.annotation.Nonnull Long pe pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -662,7 +662,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/pet/{petId}/uploadImage", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -734,7 +734,7 @@ private ResponseSpec uploadFileWithRequiredFileRequestCreation(@javax.annotation pathParams.put("petId", petId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -756,7 +756,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/fake/{petId}/uploadImageWithRequiredFile", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 28b8a660b4fc..13a24800932d 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 @@ -65,7 +65,7 @@ private ResponseSpec deleteOrderRequestCreation(@javax.annotation.Nonnull String pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -78,7 +78,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -132,7 +132,7 @@ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseExcep // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -147,7 +147,7 @@ private ResponseSpec getInventoryRequestCreation() throws WebClientResponseExcep String[] localVarAuthNames = new String[] { "api_key" }; ParameterizedTypeReference> localVarReturnType = new ParameterizedTypeReference>() {}; - return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/inventory", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -206,7 +206,7 @@ private ResponseSpec getOrderByIdRequestCreation(@javax.annotation.Nonnull Long pathParams.put("order_id", orderId); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -221,7 +221,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order/{order_id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -286,7 +286,7 @@ private ResponseSpec placeOrderRequestCreation(@javax.annotation.Nonnull Order o // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -303,7 +303,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/store/order", HttpMethod.POST, pathParams, localVarQueryParams, postBody, 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 edd1c9ffb751..60433c43e1ee 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 @@ -63,7 +63,7 @@ private ResponseSpec createUserRequestCreation(@javax.annotation.Nonnull User us // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -78,7 +78,7 @@ private ResponseSpec createUserRequestCreation(@javax.annotation.Nonnull User us String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -133,7 +133,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@javax.annotation. // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -148,7 +148,7 @@ private ResponseSpec createUsersWithArrayInputRequestCreation(@javax.annotation. String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithArray", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -203,7 +203,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@javax.annotation.N // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -218,7 +218,7 @@ private ResponseSpec createUsersWithListInputRequestCreation(@javax.annotation.N String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/createWithList", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -276,7 +276,7 @@ private ResponseSpec deleteUserRequestCreation(@javax.annotation.Nonnull String pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -289,7 +289,7 @@ private ResponseSpec deleteUserRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.DELETE, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -352,7 +352,7 @@ private ResponseSpec getUserByNameRequestCreation(@javax.annotation.Nonnull Stri pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -367,7 +367,7 @@ private ResponseSpec getUserByNameRequestCreation(@javax.annotation.Nonnull Stri String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -437,13 +437,13 @@ private ResponseSpec loginUserRequestCreation(@javax.annotation.Nonnull String u // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); - queryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "username", username)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "password", password)); final String[] localVarAccepts = { "application/xml", "application/json" @@ -455,7 +455,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, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/login", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -513,7 +513,7 @@ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseExcepti // create path and map variables final Map pathParams = new HashMap(); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -526,7 +526,7 @@ private ResponseSpec logoutUserRequestCreation() throws WebClientResponseExcepti String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/logout", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** @@ -586,7 +586,7 @@ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String pathParams.put("username", username); - final MultiValueMap queryParams = new LinkedMultiValueMap(); + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap(); final HttpHeaders headerParams = new HttpHeaders(); final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); @@ -601,7 +601,7 @@ private ResponseSpec updateUserRequestCreation(@javax.annotation.Nonnull String String[] localVarAuthNames = new String[] { }; ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + return apiClient.invokeAPI("/user/{username}", HttpMethod.PUT, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /**