[Java][Spring] Fix for #8659 - Different in-parameter types generated…

… for api and delegate for files (#9331)
OpenAPITools · Apr 26, 2021 · b9a1c8f · b9a1c8f
1 parent 812d563
commit b9a1c8f
Show file tree

Hide file tree

Showing 24 changed files with 85 additions and 85 deletions.
diff --git a/...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
@@ -336,8 +336,8 @@ public void processOpts() {
         }
         additionalProperties.put(UNHANDLED_EXCEPTION_HANDLING, this.isUnhandledException());
 
-        typeMapping.put("file", "org.springframework.core.io.Resource");
-        importMapping.put("org.springframework.core.io.Resource", "org.springframework.core.io.Resource");
+        typeMapping.put("file", "org.springframework.web.multipart.MultipartFile");
+        importMapping.put("org.springframework.web.multipart.MultipartFile", "org.springframework.web.multipart.MultipartFile");
 
         if (useOptional) {
             writePropertyBack(USE_OPTIONAL, useOptional);

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
@@ -71,7 +71,7 @@ public class {{classname}} {
     {{#isDeprecated}}
     @Deprecated
     {{/isDeprecated}}
-    public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{#isFile}}{{#useAbstractionForFiles}}{{#collectionFormat}}java.util.Collection<org.springframework.core.io.Resource>{{/collectionFormat}}{{^collectionFormat}}org.springframework.core.io.Resource{{/collectionFormat}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{dataType}}}{{/useAbstractionForFiles}}{{/isFile}}{{^isFile}}{{{dataType}}}{{/isFile}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws RestClientException {
+    public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{#isFile}}{{#useAbstractionForFiles}}{{#collectionFormat}}java.util.Collection<org.springframework.web.multipart.MultipartFile>{{/collectionFormat}}{{^collectionFormat}}org.springframework.web.multipart.MultipartFile{{/collectionFormat}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{dataType}}}{{/useAbstractionForFiles}}{{/isFile}}{{^isFile}}{{{dataType}}}{{/isFile}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws RestClientException {
         {{#returnType}}
         return {{operationId}}WithHttpInfo({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}).getBody();
         {{/returnType}}
@@ -99,7 +99,7 @@ public class {{classname}} {
     {{#isDeprecated}}
     @Deprecated
     {{/isDeprecated}}
-    public ResponseEntity<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{#isFile}}{{#useAbstractionForFiles}}{{#collectionFormat}}java.util.Collection<org.springframework.core.io.Resource>{{/collectionFormat}}{{^collectionFormat}}org.springframework.core.io.Resource{{/collectionFormat}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{dataType}}}{{/useAbstractionForFiles}}{{/isFile}}{{^isFile}}{{{dataType}}}{{/isFile}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws RestClientException {
+    public ResponseEntity<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{#isFile}}{{#useAbstractionForFiles}}{{#collectionFormat}}java.util.Collection<org.springframework.web.multipart.MultipartFile>{{/collectionFormat}}{{^collectionFormat}}org.springframework.web.multipart.MultipartFile{{/collectionFormat}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{dataType}}}{{/useAbstractionForFiles}}{{/isFile}}{{^isFile}}{{{dataType}}}{{/isFile}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}) throws RestClientException {
         Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
         {{#allParams}}{{#required}}
         // verify the required parameter '{{paramName}}' is set

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api_test.mustache
@@ -34,7 +34,7 @@ public class {{classname}}Test {
     @Test
     public void {{operationId}}Test() {
         {{#allParams}}
-        {{#isFile}}{{#useAbstractionForFiles}}{{#collectionFormat}}java.util.Collection<org.springframework.core.io.Resource>{{/collectionFormat}}{{^collectionFormat}}org.springframework.core.io.Resource{{/collectionFormat}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{dataType}}}{{/useAbstractionForFiles}}{{/isFile}}{{^isFile}}{{{dataType}}}{{/isFile}} {{paramName}} = null;
+        {{#isFile}}{{#useAbstractionForFiles}}{{#collectionFormat}}java.util.Collection<org.springframework.web.multipart.MultipartFile>{{/collectionFormat}}{{^collectionFormat}}org.springframework.web.multipart.MultipartFile{{/collectionFormat}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{dataType}}}{{/useAbstractionForFiles}}{{/isFile}}{{^isFile}}{{{dataType}}}{{/isFile}} {{paramName}} = null;
         {{/allParams}}
         {{#returnType}}{{{returnType}}} response = {{/returnType}}api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
 

diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/homeController.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/homeController.mustache
@@ -4,7 +4,7 @@ package {{configPackage}};
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
-import org.springframework.core.io.Resource;
+import org.springframework.web.multipart.MultipartFile;
 {{/useSpringfox}}
 import org.springframework.stereotype.Controller;
 {{^useSpringfox}}

diff --git a/.../openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/.../openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
@@ -1028,18 +1028,18 @@ public void testRestTemplateWithUseAbstractionForFiles() throws IOException {
         Path defaultApi = Paths.get(output + "/src/main/java/xyz/abcdef/api/MultipartApi.java");
         TestUtils.assertFileContains(defaultApi,
                 //multiple files
-                "multipartArray(java.util.Collection<org.springframework.core.io.Resource> files)",
-                "multipartArrayWithHttpInfo(java.util.Collection<org.springframework.core.io.Resource> files)",
+                "multipartArray(java.util.Collection<org.springframework.web.multipart.MultipartFile> files)",
+                "multipartArrayWithHttpInfo(java.util.Collection<org.springframework.web.multipart.MultipartFile> files)",
                 "formParams.addAll(\"files\", files.stream().collect(Collectors.toList()));",
 
                 //mixed
-                "multipartMixed(org.springframework.core.io.Resource file, MultipartMixedMarker marker)",
-                "multipartMixedWithHttpInfo(org.springframework.core.io.Resource file, MultipartMixedMarker marker)",
+                "multipartMixed(org.springframework.web.multipart.MultipartFile file, MultipartMixedMarker marker)",
+                "multipartMixedWithHttpInfo(org.springframework.web.multipart.MultipartFile file, MultipartMixedMarker marker)",
                 "formParams.add(\"file\", file);",
 
                 //single file
-                "multipartSingle(org.springframework.core.io.Resource file)",
-                "multipartSingleWithHttpInfo(org.springframework.core.io.Resource file)",
+                "multipartSingle(org.springframework.web.multipart.MultipartFile file)",
+                "multipartSingleWithHttpInfo(org.springframework.web.multipart.MultipartFile file)",
                 "formParams.add(\"file\", file);"
         );
     }

diff --git a/.../server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java b/.../server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java
@@ -44,7 +44,7 @@ public class FormatTest   {
   private byte[] _byte;
 
   @JsonProperty("binary")
-  private org.springframework.core.io.Resource binary;
+  private org.springframework.web.multipart.MultipartFile binary;
 
   @JsonProperty("date")
   @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
@@ -236,7 +236,7 @@ public void setByte(byte[] _byte) {
     this._byte = _byte;
   }
 
-  public FormatTest binary(org.springframework.core.io.Resource binary) {
+  public FormatTest binary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
     return this;
   }
@@ -249,11 +249,11 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
 
   @Valid
 
-  public org.springframework.core.io.Resource getBinary() {
+  public org.springframework.web.multipart.MultipartFile getBinary() {
     return binary;
   }
 
-  public void setBinary(org.springframework.core.io.Resource binary) {
+  public void setBinary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
   }
 

diff --git a/...petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java b/...petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java
@@ -44,7 +44,7 @@ public class FormatTest   {
   private byte[] _byte;
 
   @JsonProperty("binary")
-  private org.springframework.core.io.Resource binary;
+  private org.springframework.web.multipart.MultipartFile binary;
 
   @JsonProperty("date")
   @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
@@ -236,7 +236,7 @@ public void setByte(byte[] _byte) {
     this._byte = _byte;
   }
 
-  public FormatTest binary(org.springframework.core.io.Resource binary) {
+  public FormatTest binary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
     return this;
   }
@@ -249,11 +249,11 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
 
   @Valid
 
-  public org.springframework.core.io.Resource getBinary() {
+  public org.springframework.web.multipart.MultipartFile getBinary() {
     return binary;
   }
 
-  public void setBinary(org.springframework.core.io.Resource binary) {
+  public void setBinary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
   }
 

diff --git a/...rver/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/FormatTest.java b/...rver/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
@@ -43,7 +43,7 @@ public class FormatTest   {
   private byte[] _byte;
 
   @JsonProperty("binary")
-  private org.springframework.core.io.Resource binary;
+  private org.springframework.web.multipart.MultipartFile binary;
 
   @JsonProperty("date")
   @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
@@ -235,7 +235,7 @@ public void setByte(byte[] _byte) {
     this._byte = _byte;
   }
 
-  public FormatTest binary(org.springframework.core.io.Resource binary) {
+  public FormatTest binary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
     return this;
   }
@@ -248,11 +248,11 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
 
   @Valid
 
-  public org.springframework.core.io.Resource getBinary() {
+  public org.springframework.web.multipart.MultipartFile getBinary() {
     return binary;
   }
 
-  public void setBinary(org.springframework.core.io.Resource binary) {
+  public void setBinary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
   }
 

diff --git a/.../petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java b/.../petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java
@@ -44,7 +44,7 @@ public class FormatTest   {
   private byte[] _byte;
 
   @JsonProperty("binary")
-  private org.springframework.core.io.Resource binary;
+  private org.springframework.web.multipart.MultipartFile binary;
 
   @JsonProperty("date")
   @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
@@ -236,7 +236,7 @@ public void setByte(byte[] _byte) {
     this._byte = _byte;
   }
 
-  public FormatTest binary(org.springframework.core.io.Resource binary) {
+  public FormatTest binary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
     return this;
   }
@@ -249,11 +249,11 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
 
   @Valid
 
-  public org.springframework.core.io.Resource getBinary() {
+  public org.springframework.web.multipart.MultipartFile getBinary() {
     return binary;
   }
 
-  public void setBinary(org.springframework.core.io.Resource binary) {
+  public void setBinary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
   }
 

diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java
@@ -46,7 +46,7 @@ public class FormatTest   {
   private byte[] _byte;
 
   @JsonProperty("binary")
-  private org.springframework.core.io.Resource binary;
+  private org.springframework.web.multipart.MultipartFile binary;
 
   @JsonProperty("date")
   @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
@@ -238,7 +238,7 @@ public void setByte(byte[] _byte) {
     this._byte = _byte;
   }
 
-  public FormatTest binary(org.springframework.core.io.Resource binary) {
+  public FormatTest binary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
     return this;
   }
@@ -251,11 +251,11 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
 
   @Valid
 
-  public org.springframework.core.io.Resource getBinary() {
+  public org.springframework.web.multipart.MultipartFile getBinary() {
     return binary;
   }
 
-  public void setBinary(org.springframework.core.io.Resource binary) {
+  public void setBinary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
   }
 

diff --git a/...pringboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java b/...pringboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
@@ -43,7 +43,7 @@ public class FormatTest   {
   private byte[] _byte;
 
   @JsonProperty("binary")
-  private org.springframework.core.io.Resource binary;
+  private org.springframework.web.multipart.MultipartFile binary;
 
   @JsonProperty("date")
   @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
@@ -235,7 +235,7 @@ public void setByte(byte[] _byte) {
     this._byte = _byte;
   }
 
-  public FormatTest binary(org.springframework.core.io.Resource binary) {
+  public FormatTest binary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
     return this;
   }
@@ -248,11 +248,11 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
 
   @Valid
 
-  public org.springframework.core.io.Resource getBinary() {
+  public org.springframework.web.multipart.MultipartFile getBinary() {
     return binary;
   }
 
-  public void setBinary(org.springframework.core.io.Resource binary) {
+  public void setBinary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
   }
 

diff --git a/...r/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java b/...r/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
@@ -44,7 +44,7 @@ public class FormatTest   {
   private byte[] _byte;
 
   @JsonProperty("binary")
-  private org.springframework.core.io.Resource binary;
+  private org.springframework.web.multipart.MultipartFile binary;
 
   @JsonProperty("date")
   @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
@@ -236,7 +236,7 @@ public void setByte(byte[] _byte) {
     this._byte = _byte;
   }
 
-  public FormatTest binary(org.springframework.core.io.Resource binary) {
+  public FormatTest binary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
     return this;
   }
@@ -249,11 +249,11 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
 
   @Valid
 
-  public org.springframework.core.io.Resource getBinary() {
+  public org.springframework.web.multipart.MultipartFile getBinary() {
     return binary;
   }
 
-  public void setBinary(org.springframework.core.io.Resource binary) {
+  public void setBinary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
   }
 

diff --git a/...rver/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java b/...rver/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
@@ -44,7 +44,7 @@ public class FormatTest   {
   private byte[] _byte;
 
   @JsonProperty("binary")
-  private org.springframework.core.io.Resource binary;
+  private org.springframework.web.multipart.MultipartFile binary;
 
   @JsonProperty("date")
   @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
@@ -236,7 +236,7 @@ public void setByte(byte[] _byte) {
     this._byte = _byte;
   }
 
-  public FormatTest binary(org.springframework.core.io.Resource binary) {
+  public FormatTest binary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
     return this;
   }
@@ -249,11 +249,11 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
 
   @Valid
 
-  public org.springframework.core.io.Resource getBinary() {
+  public org.springframework.web.multipart.MultipartFile getBinary() {
     return binary;
   }
 
-  public void setBinary(org.springframework.core.io.Resource binary) {
+  public void setBinary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
   }
 

diff --git a/.../server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/.../server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
@@ -44,7 +44,7 @@ public class FormatTest   {
   private byte[] _byte;
 
   @JsonProperty("binary")
-  private org.springframework.core.io.Resource binary;
+  private org.springframework.web.multipart.MultipartFile binary;
 
   @JsonProperty("date")
   @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
@@ -236,7 +236,7 @@ public void setByte(byte[] _byte) {
     this._byte = _byte;
   }
 
-  public FormatTest binary(org.springframework.core.io.Resource binary) {
+  public FormatTest binary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
     return this;
   }
@@ -249,11 +249,11 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
 
   @Valid
 
-  public org.springframework.core.io.Resource getBinary() {
+  public org.springframework.web.multipart.MultipartFile getBinary() {
     return binary;
   }
 
-  public void setBinary(org.springframework.core.io.Resource binary) {
+  public void setBinary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
   }
 

diff --git a/.../petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/.../petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
@@ -44,7 +44,7 @@ public class FormatTest   {
   private byte[] _byte;
 
   @JsonProperty("binary")
-  private org.springframework.core.io.Resource binary;
+  private org.springframework.web.multipart.MultipartFile binary;
 
   @JsonProperty("date")
   @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
@@ -236,7 +236,7 @@ public void setByte(byte[] _byte) {
     this._byte = _byte;
   }
 
-  public FormatTest binary(org.springframework.core.io.Resource binary) {
+  public FormatTest binary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
     return this;
   }
@@ -249,11 +249,11 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
 
   @Valid
 
-  public org.springframework.core.io.Resource getBinary() {
+  public org.springframework.web.multipart.MultipartFile getBinary() {
     return binary;
   }
 
-  public void setBinary(org.springframework.core.io.Resource binary) {
+  public void setBinary(org.springframework.web.multipart.MultipartFile binary) {
     this.binary = binary;
   }