loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Java][Spring] Fix for #8659 - Different in-parameter types generated for api and delegate for files (#9331)

Browse Source
This commit is contained in:
Mateusz Hubert Stefaniak 2021-04-26 03:49:21 +02:00 committed by GitHub
parent 812d563c78
commit b9a1c8f016
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
View File

@ -336,8 +336,8 @@ public class SpringCodegen extends AbstractJavaCodegen
}
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);

4
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache vendored
View File

@ -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

2
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api_test.mustache vendored
View File

@ -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}});

2
modules/openapi-generator/src/main/resources/JavaSpring/homeController.mustache vendored
View File

@ -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}}

12
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
View File

@ -1028,18 +1028,18 @@ public class JavaClientCodegenTest {
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);"
);
}

8
samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

2
samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/configuration/HomeController.java
View File

@ -3,7 +3,7 @@ package org.openapitools.configuration;
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;
import org.springframework.stereotype.Controller;
import org.springframework.util.StreamUtils;
import org.springframework.web.bind.annotation.GetMapping;

8
samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}

8
samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -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 class FormatTest {
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 class FormatTest {
@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;
}