From 1ab96ed15fc5f53a9d71637f307bd82ee838bb11 Mon Sep 17 00:00:00 2001 From: jorgerod Date: Mon, 29 Jun 2020 15:23:40 +0200 Subject: [PATCH 1/5] gh-4803: Fix bug java client multiple files upload --- .../Java/libraries/resttemplate/api.mustache | 6 +- .../Java/libraries/webclient/api.mustache | 4 +- .../codegen/java/JavaClientCodegenTest.java | 89 ++++++++++++++++++- 3 files changed, 94 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache index dc6d434c3e43..ffd8e28e146f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache @@ -10,7 +10,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Locale; -import java.util.Map;{{/fullJavaUtil}} +import java.util.Map; +import java.util.stream.Collectors;{{/fullJavaUtil}} import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -129,8 +130,9 @@ public class {{classname}} { cookieParams.add("{{baseName}}", apiClient.parameterToString({{paramName}}));{{#hasMore}} {{/hasMore}}{{/cookieParams}}{{/hasCookieParams}}{{#hasFormParams}} + {{#collectionFormat}}{{#isFile}}List fileSystemResourcesList;{{/isFile}}{{/collectionFormat}} {{#formParams}}if ({{paramName}} != null) - formParams.{{^collectionFormat}}add{{/collectionFormat}}{{#collectionFormat}}put{{/collectionFormat}}("{{baseName}}", {{#isFile}}new FileSystemResource({{paramName}}){{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{#hasMore}} + formParams.{{^collectionFormat}}add{{/collectionFormat}}{{#collectionFormat}}put{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}new FileSystemResource({{paramName}}){{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream().map(FileSystemResource::new).collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{#hasMore}} {{/hasMore}}{{/formParams}}{{/hasFormParams}} final String[] accepts = { {{#hasProduces}} 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 7b3c23d59b48..093c675eccae 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 @@ -10,6 +10,7 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; {{/fullJavaUtil}} import org.springframework.beans.factory.annotation.Autowired; @@ -106,9 +107,10 @@ public class {{classname}} { {{/hasCookieParams}} {{#hasFormParams}} + {{#formParams}} if ({{paramName}} != null) - formParams.add{{#collectionFormat}}All{{/collectionFormat}}("{{baseName}}", {{#isFile}}new FileSystemResource({{paramName}}){{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}); + formParams.add{{#collectionFormat}}All{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}new FileSystemResource({{paramName}}){{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream().map(FileSystemResource::new).collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}); {{/formParams}} {{/hasFormParams}} 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 0a9bae81ed67..6d61c93b3efc 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 @@ -26,10 +26,8 @@ import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.parser.util.SchemaTypeUtil; import org.openapitools.codegen.*; -import org.openapitools.codegen.MockDefaultGenerator.WrittenTemplateBasedFile; import org.openapitools.codegen.config.CodegenConfigurator; import org.openapitools.codegen.languages.AbstractJavaCodegen; -import org.openapitools.codegen.languages.DartClientCodegen; import org.openapitools.codegen.languages.JavaClientCodegen; import org.testng.Assert; import org.testng.annotations.Test; @@ -842,4 +840,91 @@ public void testAnyType() { Assert.assertFalse(cp9.isFreeFormObject); Assert.assertFalse(cp9.isAnyType); } + + /** + * See https://github.com/OpenAPITools/openapi-generator/issues/4803 + */ + @Test + public void testRestTemplateFormMultipart() throws IOException { + + Map properties = new HashMap<>(); + properties.put(JavaClientCodegen.JAVA8_MODE, true); + properties.put(CodegenConstants.API_PACKAGE, "xyz.abcdef.api"); + + + File output = Files.createTempDirectory("test").toFile(); + output.deleteOnExit(); + + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName("java") + .setLibrary(JavaClientCodegen.RESTTEMPLATE) + .setAdditionalProperties(properties) + .setInputSpec("src/test/resources/3_0/form-multipart-binary-array.yaml") + .setOutputDir(output.getAbsolutePath().replace("\\", "/")); + + + DefaultGenerator generator = new DefaultGenerator(); + List files = generator.opts(configurator.toClientOptInput()).generate(); + files.forEach(File::deleteOnExit); + + + Path defaultApi = Paths.get(output + "/src/main/java/xyz/abcdef/api/MultipartApi.java"); + TestUtils.assertFileContains(defaultApi, + //multiple files + "multipartArrayWithHttpInfo(List files)", + "formParams.put(\"files\", files.stream().map(FileSystemResource::new).collect(Collectors.toList()));", + + //mixed + "multipartMixedWithHttpInfo(File file, MultipartMixedMarker marker)", + "formParams.add(\"file\", new FileSystemResource(file));", + + //single file + "multipartSingleWithHttpInfo(File file)", + "formParams.add(\"file\", new FileSystemResource(file));" + ); + } + + /** + * See https://github.com/OpenAPITools/openapi-generator/issues/4803 + */ + @Test + public void testWebClientFormMultipart() throws IOException { + + Map properties = new HashMap<>(); + properties.put(JavaClientCodegen.JAVA8_MODE, true); + properties.put(CodegenConstants.API_PACKAGE, "xyz.abcdef.api"); + + + File output = Files.createTempDirectory("test").toFile(); + output.deleteOnExit(); + + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName("java") + .setLibrary(JavaClientCodegen.WEBCLIENT) + .setAdditionalProperties(properties) + .setInputSpec("src/test/resources/3_0/form-multipart-binary-array.yaml") + .setOutputDir(output.getAbsolutePath().replace("\\", "/")); + + + DefaultGenerator generator = new DefaultGenerator(); + List files = generator.opts(configurator.toClientOptInput()).generate(); + files.forEach(File::deleteOnExit); + + + Path defaultApi = Paths.get(output + "/src/main/java/xyz/abcdef/api/MultipartApi.java"); + TestUtils.assertFileContains(defaultApi, + //multiple files + "multipartArray(List files)", + "formParams.addAll(\"files\", files.stream().map(FileSystemResource::new).collect(Collectors.toList()));", + + //mixed + "multipartMixed(File file, MultipartMixedMarker marker)", + "formParams.add(\"file\", new FileSystemResource(file));", + + //single file + "multipartSingle(File file)", + "formParams.add(\"file\", new FileSystemResource(file));" + ); + } + } From f78a9e2e6fe171966a7a1605e6f590c8b54c5c95 Mon Sep 17 00:00:00 2001 From: jorgerod Date: Mon, 29 Jun 2020 15:29:07 +0200 Subject: [PATCH 2/5] gh-4803: Fix bug java client multiple files upload --- .../src/main/resources/Java/libraries/resttemplate/api.mustache | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache index ffd8e28e146f..2f1ed68e9963 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache @@ -130,7 +130,6 @@ public class {{classname}} { cookieParams.add("{{baseName}}", apiClient.parameterToString({{paramName}}));{{#hasMore}} {{/hasMore}}{{/cookieParams}}{{/hasCookieParams}}{{#hasFormParams}} - {{#collectionFormat}}{{#isFile}}List fileSystemResourcesList;{{/isFile}}{{/collectionFormat}} {{#formParams}}if ({{paramName}} != null) formParams.{{^collectionFormat}}add{{/collectionFormat}}{{#collectionFormat}}put{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}new FileSystemResource({{paramName}}){{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream().map(FileSystemResource::new).collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{#hasMore}} {{/hasMore}}{{/formParams}}{{/hasFormParams}} From f28643cc574619e830bba5503ee85bd33e92d9e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Rodr=C3=ADguez?= Date: Mon, 29 Jun 2020 15:46:07 +0200 Subject: [PATCH 3/5] gh-4803: Fix bug java client multiple files upload --- .../src/main/resources/Java/libraries/webclient/api.mustache | 1 - .../main/java/org/openapitools/client/api/AnotherFakeApi.java | 1 + .../src/main/java/org/openapitools/client/api/FakeApi.java | 4 ++++ .../org/openapitools/client/api/FakeClassnameTags123Api.java | 1 + .../src/main/java/org/openapitools/client/api/PetApi.java | 4 ++++ .../src/main/java/org/openapitools/client/api/StoreApi.java | 1 + .../src/main/java/org/openapitools/client/api/UserApi.java | 1 + .../main/java/org/openapitools/client/api/AnotherFakeApi.java | 1 + .../src/main/java/org/openapitools/client/api/FakeApi.java | 4 ++++ .../org/openapitools/client/api/FakeClassnameTags123Api.java | 1 + .../src/main/java/org/openapitools/client/api/PetApi.java | 4 ++++ .../src/main/java/org/openapitools/client/api/StoreApi.java | 1 + .../src/main/java/org/openapitools/client/api/UserApi.java | 1 + .../src/main/java/org/openapitools/client/api/FakeApi.java | 3 +++ .../src/main/java/org/openapitools/client/api/PetApi.java | 3 +++ 15 files changed, 30 insertions(+), 1 deletion(-) 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 093c675eccae..a8077006c8ff 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 @@ -107,7 +107,6 @@ public class {{classname}} { {{/hasCookieParams}} {{#hasFormParams}} - {{#formParams}} if ({{paramName}} != null) formParams.add{{#collectionFormat}}All{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}new FileSystemResource({{paramName}}){{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream().map(FileSystemResource::new).collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}); diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 125dfe43c2af..0e9eaf39cd4b 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java index 4fe805f179d9..90de812f9e62 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -497,6 +498,7 @@ public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (integer != null) formParams.add("integer", integer); if (int32 != null) @@ -593,6 +595,7 @@ public ResponseEntity testEnumParametersWithHttpInfo(List enumHead if (enumHeaderString != null) headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + if (enumFormStringArray != null) formParams.put("enum_form_string_array", enumFormStringArray); if (enumFormString != null) @@ -771,6 +774,7 @@ public ResponseEntity testJsonFormDataWithHttpInfo(String param, String pa final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (param != null) formParams.add("param", param); if (param2 != null) diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index e8363fe361b2..d9c821519609 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java index 896f7773eeb2..ef81dd999795 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java @@ -13,6 +13,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -404,6 +405,7 @@ public ResponseEntity updatePetWithFormWithHttpInfo(Long petId, String nam final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (name != null) formParams.add("name", name); if (status != null) @@ -463,6 +465,7 @@ public ResponseEntity uploadFileWithHttpInfo(Long petId, Strin final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (file != null) @@ -529,6 +532,7 @@ public ResponseEntity uploadFileWithRequiredFileWithHttpInfo(L final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (requiredFile != null) diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java index b4041f3291e0..d2897deda183 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java index 996273ebf09d..7dea94d09185 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 125dfe43c2af..0e9eaf39cd4b 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java index 4fe805f179d9..90de812f9e62 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -497,6 +498,7 @@ public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (integer != null) formParams.add("integer", integer); if (int32 != null) @@ -593,6 +595,7 @@ public ResponseEntity testEnumParametersWithHttpInfo(List enumHead if (enumHeaderString != null) headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + if (enumFormStringArray != null) formParams.put("enum_form_string_array", enumFormStringArray); if (enumFormString != null) @@ -771,6 +774,7 @@ public ResponseEntity testJsonFormDataWithHttpInfo(String param, String pa final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (param != null) formParams.add("param", param); if (param2 != null) diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index e8363fe361b2..d9c821519609 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java index 896f7773eeb2..ef81dd999795 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java @@ -13,6 +13,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -404,6 +405,7 @@ public ResponseEntity updatePetWithFormWithHttpInfo(Long petId, String nam final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (name != null) formParams.add("name", name); if (status != null) @@ -463,6 +465,7 @@ public ResponseEntity uploadFileWithHttpInfo(Long petId, Strin final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (file != null) @@ -529,6 +532,7 @@ public ResponseEntity uploadFileWithRequiredFileWithHttpInfo(L final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (requiredFile != null) diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java index b4041f3291e0..d2897deda183 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java index 996273ebf09d..7dea94d09185 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; 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 4e16c1bbd672..89daef1b0400 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 @@ -361,6 +361,7 @@ public Mono testEndpointParameters(BigDecimal number, Double _double, Stri final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (integer != null) formParams.add("integer", integer); if (int32 != null) @@ -436,6 +437,7 @@ public Mono testEnumParameters(List enumHeaderStringArray, String headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); if (enumHeaderString != null) headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + if (enumFormStringArray != null) formParams.addAll("enum_form_string_array", enumFormStringArray); if (enumFormString != null) @@ -565,6 +567,7 @@ public Mono testJsonFormData(String param, String param2) throws WebClient final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (param != null) formParams.add("param", param); if (param2 != null) 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 eeac635d156e..61e84bd3ef06 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 @@ -291,6 +291,7 @@ public Mono updatePetWithForm(Long petId, String name, String status) thro final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (name != null) formParams.add("name", name); if (status != null) @@ -334,6 +335,7 @@ public Mono uploadFile(Long petId, String additionalMetadata, final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (file != null) @@ -383,6 +385,7 @@ public Mono uploadFileWithRequiredFile(Long petId, File requir final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (requiredFile != null) From 97d09a0249d01437cabb77b95e2387320c835a16 Mon Sep 17 00:00:00 2001 From: Jorge Rodriguez Date: Mon, 29 Jun 2020 15:46:07 +0200 Subject: [PATCH 4/5] gh-4803: Fix bug java client multiple files upload --- .../src/main/resources/Java/libraries/webclient/api.mustache | 1 - .../main/java/org/openapitools/client/api/AnotherFakeApi.java | 1 + .../src/main/java/org/openapitools/client/api/FakeApi.java | 4 ++++ .../org/openapitools/client/api/FakeClassnameTags123Api.java | 1 + .../src/main/java/org/openapitools/client/api/PetApi.java | 4 ++++ .../src/main/java/org/openapitools/client/api/StoreApi.java | 1 + .../src/main/java/org/openapitools/client/api/UserApi.java | 1 + .../main/java/org/openapitools/client/api/AnotherFakeApi.java | 1 + .../src/main/java/org/openapitools/client/api/FakeApi.java | 4 ++++ .../org/openapitools/client/api/FakeClassnameTags123Api.java | 1 + .../src/main/java/org/openapitools/client/api/PetApi.java | 4 ++++ .../src/main/java/org/openapitools/client/api/StoreApi.java | 1 + .../src/main/java/org/openapitools/client/api/UserApi.java | 1 + .../main/java/org/openapitools/client/api/AnotherFakeApi.java | 1 + .../src/main/java/org/openapitools/client/api/FakeApi.java | 3 +++ .../src/main/java/org/openapitools/client/api/PetApi.java | 3 +++ 16 files changed, 31 insertions(+), 1 deletion(-) 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 093c675eccae..a8077006c8ff 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 @@ -107,7 +107,6 @@ public class {{classname}} { {{/hasCookieParams}} {{#hasFormParams}} - {{#formParams}} if ({{paramName}} != null) formParams.add{{#collectionFormat}}All{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}new FileSystemResource({{paramName}}){{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream().map(FileSystemResource::new).collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}); diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 125dfe43c2af..0e9eaf39cd4b 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java index 4fe805f179d9..90de812f9e62 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -497,6 +498,7 @@ public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (integer != null) formParams.add("integer", integer); if (int32 != null) @@ -593,6 +595,7 @@ public ResponseEntity testEnumParametersWithHttpInfo(List enumHead if (enumHeaderString != null) headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + if (enumFormStringArray != null) formParams.put("enum_form_string_array", enumFormStringArray); if (enumFormString != null) @@ -771,6 +774,7 @@ public ResponseEntity testJsonFormDataWithHttpInfo(String param, String pa final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (param != null) formParams.add("param", param); if (param2 != null) diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index e8363fe361b2..d9c821519609 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java index 896f7773eeb2..ef81dd999795 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java @@ -13,6 +13,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -404,6 +405,7 @@ public ResponseEntity updatePetWithFormWithHttpInfo(Long petId, String nam final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (name != null) formParams.add("name", name); if (status != null) @@ -463,6 +465,7 @@ public ResponseEntity uploadFileWithHttpInfo(Long petId, Strin final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (file != null) @@ -529,6 +532,7 @@ public ResponseEntity uploadFileWithRequiredFileWithHttpInfo(L final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (requiredFile != null) diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java index b4041f3291e0..d2897deda183 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/StoreApi.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java index 996273ebf09d..7dea94d09185 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/UserApi.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 125dfe43c2af..0e9eaf39cd4b 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java index 4fe805f179d9..90de812f9e62 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -497,6 +498,7 @@ public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (integer != null) formParams.add("integer", integer); if (int32 != null) @@ -593,6 +595,7 @@ public ResponseEntity testEnumParametersWithHttpInfo(List enumHead if (enumHeaderString != null) headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + if (enumFormStringArray != null) formParams.put("enum_form_string_array", enumFormStringArray); if (enumFormString != null) @@ -771,6 +774,7 @@ public ResponseEntity testJsonFormDataWithHttpInfo(String param, String pa final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (param != null) formParams.add("param", param); if (param2 != null) diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index e8363fe361b2..d9c821519609 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java index 896f7773eeb2..ef81dd999795 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java @@ -13,6 +13,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -404,6 +405,7 @@ public ResponseEntity updatePetWithFormWithHttpInfo(Long petId, String nam final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (name != null) formParams.add("name", name); if (status != null) @@ -463,6 +465,7 @@ public ResponseEntity uploadFileWithHttpInfo(Long petId, Strin final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (file != null) @@ -529,6 +532,7 @@ public ResponseEntity uploadFileWithRequiredFileWithHttpInfo(L final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (requiredFile != null) diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java index b4041f3291e0..d2897deda183 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/StoreApi.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java index 996273ebf09d..7dea94d09185 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/UserApi.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; 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 a0401a7fed37..edc44d999374 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 @@ -8,6 +8,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; 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 4e16c1bbd672..89daef1b0400 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 @@ -361,6 +361,7 @@ public Mono testEndpointParameters(BigDecimal number, Double _double, Stri final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (integer != null) formParams.add("integer", integer); if (int32 != null) @@ -436,6 +437,7 @@ public Mono testEnumParameters(List enumHeaderStringArray, String headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); if (enumHeaderString != null) headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); + if (enumFormStringArray != null) formParams.addAll("enum_form_string_array", enumFormStringArray); if (enumFormString != null) @@ -565,6 +567,7 @@ public Mono testJsonFormData(String param, String param2) throws WebClient final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (param != null) formParams.add("param", param); if (param2 != null) 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 eeac635d156e..61e84bd3ef06 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 @@ -291,6 +291,7 @@ public Mono updatePetWithForm(Long petId, String name, String status) thro final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (name != null) formParams.add("name", name); if (status != null) @@ -334,6 +335,7 @@ public Mono uploadFile(Long petId, String additionalMetadata, final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (file != null) @@ -383,6 +385,7 @@ public Mono uploadFileWithRequiredFile(Long petId, File requir final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); + if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (requiredFile != null) From d88061adfec964368ca14454092a43e8cf360998 Mon Sep 17 00:00:00 2001 From: Jorge Rodriguez Date: Tue, 30 Jun 2020 09:26:15 +0200 Subject: [PATCH 5/5] gh-4803: Fix bug java client multiple files upload --- .../src/main/java/org/openapitools/client/api/FakeApi.java | 3 --- .../src/main/java/org/openapitools/client/api/PetApi.java | 3 --- .../src/main/java/org/openapitools/client/api/FakeApi.java | 3 --- .../src/main/java/org/openapitools/client/api/PetApi.java | 3 --- .../src/main/java/org/openapitools/client/api/FakeApi.java | 4 +--- .../org/openapitools/client/api/FakeClassnameTags123Api.java | 1 + .../src/main/java/org/openapitools/client/api/PetApi.java | 4 +--- .../src/main/java/org/openapitools/client/api/StoreApi.java | 1 + .../src/main/java/org/openapitools/client/api/UserApi.java | 1 + 9 files changed, 5 insertions(+), 18 deletions(-) diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java index 90de812f9e62..e3fda6c1ee12 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java @@ -498,7 +498,6 @@ public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (integer != null) formParams.add("integer", integer); if (int32 != null) @@ -595,7 +594,6 @@ public ResponseEntity testEnumParametersWithHttpInfo(List enumHead if (enumHeaderString != null) headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); - if (enumFormStringArray != null) formParams.put("enum_form_string_array", enumFormStringArray); if (enumFormString != null) @@ -774,7 +772,6 @@ public ResponseEntity testJsonFormDataWithHttpInfo(String param, String pa final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (param != null) formParams.add("param", param); if (param2 != null) diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java index ef81dd999795..eac8abdc3ccd 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java @@ -405,7 +405,6 @@ public ResponseEntity updatePetWithFormWithHttpInfo(Long petId, String nam final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (name != null) formParams.add("name", name); if (status != null) @@ -465,7 +464,6 @@ public ResponseEntity uploadFileWithHttpInfo(Long petId, Strin final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (file != null) @@ -532,7 +530,6 @@ public ResponseEntity uploadFileWithRequiredFileWithHttpInfo(L final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (requiredFile != null) diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java index 90de812f9e62..e3fda6c1ee12 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java @@ -498,7 +498,6 @@ public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (integer != null) formParams.add("integer", integer); if (int32 != null) @@ -595,7 +594,6 @@ public ResponseEntity testEnumParametersWithHttpInfo(List enumHead if (enumHeaderString != null) headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); - if (enumFormStringArray != null) formParams.put("enum_form_string_array", enumFormStringArray); if (enumFormString != null) @@ -774,7 +772,6 @@ public ResponseEntity testJsonFormDataWithHttpInfo(String param, String pa final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (param != null) formParams.add("param", param); if (param2 != null) diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java index ef81dd999795..eac8abdc3ccd 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java @@ -405,7 +405,6 @@ public ResponseEntity updatePetWithFormWithHttpInfo(Long petId, String nam final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (name != null) formParams.add("name", name); if (status != null) @@ -465,7 +464,6 @@ public ResponseEntity uploadFileWithHttpInfo(Long petId, Strin final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (file != null) @@ -532,7 +530,6 @@ public ResponseEntity uploadFileWithRequiredFileWithHttpInfo(L final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (requiredFile != null) 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 89daef1b0400..95108f72e5e1 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 @@ -16,6 +16,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; @@ -361,7 +362,6 @@ public Mono testEndpointParameters(BigDecimal number, Double _double, Stri final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (integer != null) formParams.add("integer", integer); if (int32 != null) @@ -437,7 +437,6 @@ public Mono testEnumParameters(List enumHeaderStringArray, String headerParams.add("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray)); if (enumHeaderString != null) headerParams.add("enum_header_string", apiClient.parameterToString(enumHeaderString)); - if (enumFormStringArray != null) formParams.addAll("enum_form_string_array", enumFormStringArray); if (enumFormString != null) @@ -567,7 +566,6 @@ public Mono testJsonFormData(String param, String param2) throws WebClient final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (param != null) formParams.add("param", param); if (param2 != null) 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 eb9dca43bfd0..2a2d3f3e1d8d 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 @@ -8,6 +8,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; 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 61e84bd3ef06..3749fe40927c 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 @@ -11,6 +11,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; @@ -291,7 +292,6 @@ public Mono updatePetWithForm(Long petId, String name, String status) thro final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (name != null) formParams.add("name", name); if (status != null) @@ -335,7 +335,6 @@ public Mono uploadFile(Long petId, String additionalMetadata, final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (file != null) @@ -385,7 +384,6 @@ public Mono uploadFileWithRequiredFile(Long petId, File requir final MultiValueMap cookieParams = new LinkedMultiValueMap(); final MultiValueMap formParams = new LinkedMultiValueMap(); - if (additionalMetadata != null) formParams.add("additionalMetadata", additionalMetadata); if (requiredFile != null) 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 6fd8ced9ca21..98d603a25455 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 @@ -8,6 +8,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; 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 c5d010170141..62188c93a1cc 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 @@ -8,6 +8,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap;