Skip to content

Commit 60958b7

Browse files
jorgerodwing328
jorgerod
authored and
wing328
committed
[BUG] [Java] Client resttemplate and webclient. Form Params are badly added when they are lists (#4461)
* 4383: Client resttemplate and webclient. Form Params are badly added when they are lists * 4383: Force redeploy * 4383: Fix test * 4383: Fix map * 4383: revert change * 4383: Fix test resttemplate-withXml
1 parent 5181ddc commit 60958b7

File tree

16 files changed

+81
-81
lines changed

16 files changed

+81
-81
lines changed

‎modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public class {{classname}} {
116116
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
117117
final HttpHeaders headerParams = new HttpHeaders();
118118
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
119-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();{{#hasQueryParams}}
119+
final MultiValueMap formParams = new LinkedMultiValueMap();{{#hasQueryParams}}
120120

121121
{{#queryParams}}queryParams.putAll(apiClient.parameterToMultiValueMap({{#collectionFormat}}ApiClient.CollectionFormat.valueOf("{{{collectionFormat}}}".toUpperCase(Locale.ROOT)){{/collectionFormat}}{{^collectionFormat}}null{{/collectionFormat}}, "{{baseName}}", {{paramName}}));{{#hasMore}}
122122
{{/hasMore}}{{/queryParams}}{{/hasQueryParams}}{{#hasHeaderParams}}
@@ -130,7 +130,7 @@ public class {{classname}} {
130130
{{/hasMore}}{{/cookieParams}}{{/hasCookieParams}}{{#hasFormParams}}
131131

132132
{{#formParams}}if ({{paramName}} != null)
133-
formParams.add("{{baseName}}", {{#isFile}}new FileSystemResource({{paramName}}){{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{#hasMore}}
133+
formParams.{{^collectionFormat}}add{{/collectionFormat}}{{#collectionFormat}}put{{/collectionFormat}}("{{baseName}}", {{#isFile}}new FileSystemResource({{paramName}}){{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{#hasMore}}
134134
{{/hasMore}}{{/formParams}}{{/hasFormParams}}
135135

136136
final String[] accepts = { {{#hasProduces}}

‎modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public class {{classname}} {
8888
{{/hasMore}}{{/cookieParams}}{{/hasCookieParams}}{{#hasFormParams}}
8989

9090
{{#formParams}}if ({{paramName}} != null)
91-
formParams.add("{{baseName}}", {{#isFile}}new FileSystemResource({{paramName}}){{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{#hasMore}}
91+
formParams.add{{#collectionFormat}}All{{/collectionFormat}}("{{baseName}}", {{#isFile}}new FileSystemResource({{paramName}}){{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{#hasMore}}
9292
{{/hasMore}}{{/formParams}}{{/hasFormParams}}
9393

9494
final String[] accepts = { {{#hasProduces}}

‎samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public ResponseEntity<Client> call123testSpecialTagsWithHttpInfo(Client body) th
8181
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
8282
final HttpHeaders headerParams = new HttpHeaders();
8383
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
84-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
84+
final MultiValueMap formParams = new LinkedMultiValueMap();
8585

8686
final String[] accepts = {
8787
"application/json"

‎samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public ResponseEntity<Void> createXmlItemWithHttpInfo(XmlItem xmlItem) throws Re
8888
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
8989
final HttpHeaders headerParams = new HttpHeaders();
9090
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
91-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
91+
final MultiValueMap formParams = new LinkedMultiValueMap();
9292

9393
final String[] accepts = { };
9494
final List<MediaType> accept = apiClient.selectHeaderAccept(accepts);
@@ -130,7 +130,7 @@ public ResponseEntity<Boolean> fakeOuterBooleanSerializeWithHttpInfo(Boolean bod
130130
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
131131
final HttpHeaders headerParams = new HttpHeaders();
132132
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
133-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
133+
final MultiValueMap formParams = new LinkedMultiValueMap();
134134

135135
final String[] accepts = {
136136
"*/*"
@@ -172,7 +172,7 @@ public ResponseEntity<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(Ou
172172
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
173173
final HttpHeaders headerParams = new HttpHeaders();
174174
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
175-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
175+
final MultiValueMap formParams = new LinkedMultiValueMap();
176176

177177
final String[] accepts = {
178178
"*/*"
@@ -214,7 +214,7 @@ public ResponseEntity<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(BigDecima
214214
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
215215
final HttpHeaders headerParams = new HttpHeaders();
216216
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
217-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
217+
final MultiValueMap formParams = new LinkedMultiValueMap();
218218

219219
final String[] accepts = {
220220
"*/*"
@@ -256,7 +256,7 @@ public ResponseEntity<String> fakeOuterStringSerializeWithHttpInfo(String body)
256256
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
257257
final HttpHeaders headerParams = new HttpHeaders();
258258
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
259-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
259+
final MultiValueMap formParams = new LinkedMultiValueMap();
260260

261261
final String[] accepts = {
262262
"*/*"
@@ -302,7 +302,7 @@ public ResponseEntity<Void> testBodyWithFileSchemaWithHttpInfo(FileSchemaTestCla
302302
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
303303
final HttpHeaders headerParams = new HttpHeaders();
304304
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
305-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
305+
final MultiValueMap formParams = new LinkedMultiValueMap();
306306

307307
final String[] accepts = { };
308308
final List<MediaType> accept = apiClient.selectHeaderAccept(accepts);
@@ -355,7 +355,7 @@ public ResponseEntity<Void> testBodyWithQueryParamsWithHttpInfo(String query, Us
355355
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
356356
final HttpHeaders headerParams = new HttpHeaders();
357357
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
358-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
358+
final MultiValueMap formParams = new LinkedMultiValueMap();
359359

360360
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "query", query));
361361

@@ -404,7 +404,7 @@ public ResponseEntity<Client> testClientModelWithHttpInfo(Client body) throws Re
404404
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
405405
final HttpHeaders headerParams = new HttpHeaders();
406406
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
407-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
407+
final MultiValueMap formParams = new LinkedMultiValueMap();
408408

409409
final String[] accepts = {
410410
"application/json"
@@ -495,7 +495,7 @@ public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number
495495
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
496496
final HttpHeaders headerParams = new HttpHeaders();
497497
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
498-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
498+
final MultiValueMap formParams = new LinkedMultiValueMap();
499499

500500
if (integer != null)
501501
formParams.add("integer", integer);
@@ -581,7 +581,7 @@ public ResponseEntity<Void> testEnumParametersWithHttpInfo(List<String> enumHead
581581
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
582582
final HttpHeaders headerParams = new HttpHeaders();
583583
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
584-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
584+
final MultiValueMap formParams = new LinkedMultiValueMap();
585585

586586
queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "enum_query_string_array", enumQueryStringArray));
587587
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "enum_query_string", enumQueryString));
@@ -594,7 +594,7 @@ public ResponseEntity<Void> testEnumParametersWithHttpInfo(List<String> enumHead
594594
headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString));
595595

596596
if (enumFormStringArray != null)
597-
formParams.add("enum_form_string_array", enumFormStringArray);
597+
formParams.put("enum_form_string_array", enumFormStringArray);
598598
if (enumFormString != null)
599599
formParams.add("enum_form_string", enumFormString);
600600

@@ -662,7 +662,7 @@ public ResponseEntity<Void> testGroupParametersWithHttpInfo(Integer requiredStri
662662
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
663663
final HttpHeaders headerParams = new HttpHeaders();
664664
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
665-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
665+
final MultiValueMap formParams = new LinkedMultiValueMap();
666666

667667
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_string_group", requiredStringGroup));
668668
queryParams.putAll(apiClient.parameterToMultiValueMap(null, "required_int64_group", requiredInt64Group));
@@ -716,7 +716,7 @@ public ResponseEntity<Void> testInlineAdditionalPropertiesWithHttpInfo(Map<Strin
716716
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
717717
final HttpHeaders headerParams = new HttpHeaders();
718718
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
719-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
719+
final MultiValueMap formParams = new LinkedMultiValueMap();
720720

721721
final String[] accepts = { };
722722
final List<MediaType> accept = apiClient.selectHeaderAccept(accepts);
@@ -769,7 +769,7 @@ public ResponseEntity<Void> testJsonFormDataWithHttpInfo(String param, String pa
769769
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
770770
final HttpHeaders headerParams = new HttpHeaders();
771771
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
772-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
772+
final MultiValueMap formParams = new LinkedMultiValueMap();
773773

774774
if (param != null)
775775
formParams.add("param", param);
@@ -848,7 +848,7 @@ public ResponseEntity<Void> testQueryParameterCollectionFormatWithHttpInfo(List<
848848
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
849849
final HttpHeaders headerParams = new HttpHeaders();
850850
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
851-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
851+
final MultiValueMap formParams = new LinkedMultiValueMap();
852852

853853
queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "pipe", pipe));
854854
queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "ioutil", ioutil));

‎samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public ResponseEntity<Client> testClassnameWithHttpInfo(Client body) throws Rest
8181
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
8282
final HttpHeaders headerParams = new HttpHeaders();
8383
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
84-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
84+
final MultiValueMap formParams = new LinkedMultiValueMap();
8585

8686
final String[] accepts = {
8787
"application/json"

‎samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public ResponseEntity<Void> addPetWithHttpInfo(Pet body) throws RestClientExcept
8484
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
8585
final HttpHeaders headerParams = new HttpHeaders();
8686
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
87-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
87+
final MultiValueMap formParams = new LinkedMultiValueMap();
8888

8989
final String[] accepts = { };
9090
final List<MediaType> accept = apiClient.selectHeaderAccept(accepts);
@@ -137,7 +137,7 @@ public ResponseEntity<Void> deletePetWithHttpInfo(Long petId, String apiKey) thr
137137
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
138138
final HttpHeaders headerParams = new HttpHeaders();
139139
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
140-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
140+
final MultiValueMap formParams = new LinkedMultiValueMap();
141141

142142
if (apiKey != null)
143143
headerParams.add("api_key", apiClient.parameterToString(apiKey));
@@ -187,7 +187,7 @@ public ResponseEntity<List<Pet>> findPetsByStatusWithHttpInfo(List<String> statu
187187
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
188188
final HttpHeaders headerParams = new HttpHeaders();
189189
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
190-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
190+
final MultiValueMap formParams = new LinkedMultiValueMap();
191191

192192
queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "status", status));
193193

@@ -240,7 +240,7 @@ public ResponseEntity<List<Pet>> findPetsByTagsWithHttpInfo(List<String> tags) t
240240
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
241241
final HttpHeaders headerParams = new HttpHeaders();
242242
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
243-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
243+
final MultiValueMap formParams = new LinkedMultiValueMap();
244244

245245
queryParams.putAll(apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.valueOf("csv".toUpperCase(Locale.ROOT)), "tags", tags));
246246

@@ -296,7 +296,7 @@ public ResponseEntity<Pet> getPetByIdWithHttpInfo(Long petId) throws RestClientE
296296
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
297297
final HttpHeaders headerParams = new HttpHeaders();
298298
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
299-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
299+
final MultiValueMap formParams = new LinkedMultiValueMap();
300300

301301
final String[] accepts = {
302302
"application/xml", "application/json"
@@ -348,7 +348,7 @@ public ResponseEntity<Void> updatePetWithHttpInfo(Pet body) throws RestClientExc
348348
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
349349
final HttpHeaders headerParams = new HttpHeaders();
350350
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
351-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
351+
final MultiValueMap formParams = new LinkedMultiValueMap();
352352

353353
final String[] accepts = { };
354354
final List<MediaType> accept = apiClient.selectHeaderAccept(accepts);
@@ -401,7 +401,7 @@ public ResponseEntity<Void> updatePetWithFormWithHttpInfo(Long petId, String nam
401401
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
402402
final HttpHeaders headerParams = new HttpHeaders();
403403
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
404-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
404+
final MultiValueMap formParams = new LinkedMultiValueMap();
405405

406406
if (name != null)
407407
formParams.add("name", name);
@@ -460,7 +460,7 @@ public ResponseEntity<ModelApiResponse> uploadFileWithHttpInfo(Long petId, Strin
460460
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
461461
final HttpHeaders headerParams = new HttpHeaders();
462462
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
463-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
463+
final MultiValueMap formParams = new LinkedMultiValueMap();
464464

465465
if (additionalMetadata != null)
466466
formParams.add("additionalMetadata", additionalMetadata);
@@ -526,7 +526,7 @@ public ResponseEntity<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(L
526526
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
527527
final HttpHeaders headerParams = new HttpHeaders();
528528
final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
529-
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
529+
final MultiValueMap formParams = new LinkedMultiValueMap();
530530

531531
if (additionalMetadata != null)
532532
formParams.add("additionalMetadata", additionalMetadata);

0 commit comments

Comments
 (0)