From 7bd10405421c1b30810633036a9e2034f9fc1c31 Mon Sep 17 00:00:00 2001 From: Lars Uffmann Date: Sun, 30 Jan 2022 21:51:01 +0100 Subject: [PATCH 1/2] Revert to fully qualified import for org.springframework.core.io.Resource --- .../org/openapitools/codegen/languages/SpringCodegen.java | 4 ++-- .../openapitools/codegen/java/spring/SpringCodegenTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index ec8853e4a969..412e6c9bbbfe 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -404,8 +404,8 @@ public void processOpts() { } additionalProperties.put(UNHANDLED_EXCEPTION_HANDLING, this.isUnhandledException()); - typeMapping.put("file", "Resource"); - importMapping.put("Resource", "org.springframework.core.io.Resource"); + typeMapping.put("file", "org.springframework.core.io.Resource"); + importMapping.put("org.springframework.core.io.Resource", "org.springframework.core.io.Resource"); importMapping.put("Pageable", "org.springframework.data.domain.Pageable"); importMapping.put("DateTimeFormat", "org.springframework.format.annotation.DateTimeFormat"); importMapping.put("ApiIgnore", "springfox.documentation.annotations.ApiIgnore"); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 456dea2f4001..7c086c50a60f 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -792,14 +792,14 @@ public void testConfigFileGeneration() { public void testTypeMappings() { final SpringCodegen codegen = new SpringCodegen(); codegen.processOpts(); - Assert.assertEquals(codegen.typeMapping().get("file"), "Resource"); + Assert.assertEquals(codegen.typeMapping().get("file"), "org.springframework.core.io.Resource"); } @Test public void testImportMappings() { final SpringCodegen codegen = new SpringCodegen(); codegen.processOpts(); - Assert.assertEquals(codegen.importMapping().get("Resource"), "org.springframework.core.io.Resource"); + Assert.assertEquals(codegen.importMapping().get("org.springframework.core.io.Resource"), "org.springframework.core.io.Resource"); Assert.assertEquals(codegen.importMapping().get("Pageable"), "org.springframework.data.domain.Pageable"); Assert.assertEquals(codegen.importMapping().get("DateTimeFormat"), "org.springframework.format.annotation.DateTimeFormat"); Assert.assertEquals(codegen.importMapping().get("ApiIgnore"), "springfox.documentation.annotations.ApiIgnore"); From 4be26243551638b39703e0122dca65216eec4b13 Mon Sep 17 00:00:00 2001 From: Lars Uffmann Date: Sun, 30 Jan 2022 21:58:09 +0100 Subject: [PATCH 2/2] Generate Samples --- .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../java/org/openapitools/api/FakeApiController.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../main/java/org/openapitools/api/PetApiController.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../main/java/org/openapitools/api/FakeApiDelegate.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../main/java/org/openapitools/api/PetApiDelegate.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../main/java/org/openapitools/api/FakeApiDelegate.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../main/java/org/openapitools/api/PetApiDelegate.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../java/org/openapitools/api/FakeApiController.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../main/java/org/openapitools/api/PetApiController.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../main/java/org/openapitools/api/FakeApiDelegate.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../main/java/org/openapitools/api/PetApiDelegate.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../main/java/org/openapitools/api/FakeApiDelegate.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../main/java/org/openapitools/api/PetApiDelegate.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../main/java/org/openapitools/api/FakeApiDelegate.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../main/java/org/openapitools/api/PetApiDelegate.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../java/org/openapitools/api/FakeApiController.java | 1 - .../main/java/org/openapitools/api/FakeApiDelegate.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../main/java/org/openapitools/api/PetApiController.java | 1 - .../main/java/org/openapitools/api/PetApiDelegate.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../main/java/org/openapitools/api/FakeApiDelegate.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../main/java/org/openapitools/api/PetApiDelegate.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../java/org/openapitools/api/FakeApiController.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../main/java/org/openapitools/api/PetApiController.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- .../java/org/openapitools/virtualan/api/FakeApi.java | 1 - .../main/java/org/openapitools/virtualan/api/PetApi.java | 1 - .../org/openapitools/virtualan/model/FormatTest.java | 9 ++++----- .../src/main/java/org/openapitools/api/FakeApi.java | 1 - .../src/main/java/org/openapitools/api/PetApi.java | 1 - .../src/main/java/org/openapitools/model/FormatTest.java | 9 ++++----- 104 files changed, 96 insertions(+), 200 deletions(-) diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java index d5f991221430..05f29fd34777 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 9967f902fbf0..988fa83dbdc7 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.data.domain.Pageable; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java index 5bb72a8db6d2..4fa012be898e 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java index ea38051f7a9f..4b326d6d4900 100644 --- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java index 7e87d57e371f..a0345aa87189 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java index f6b8fb74feb1..723e662e99be 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java @@ -13,7 +13,6 @@ import java.util.Map; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.v3.oas.annotations.Operation; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java index b5d40e07435a..72312ea96f92 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java index 0c14e2c93c1b..6790fc82a0ba 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java @@ -9,7 +9,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -53,7 +52,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -234,7 +233,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -245,11 +244,11 @@ public FormatTest binary(Resource binary) { */ @Valid @Schema(name = "binary", required = false) - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 1a58d97ea6ca..f5558f9fd117 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -9,7 +9,6 @@ import org.springframework.data.domain.Pageable; import org.springdoc.api.annotations.ParameterObject; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java index 9f82a4385212..14599fd0eac4 100644 --- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java index a8206198c4a8..75bca1aa3b94 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java index f27571c387be..8c14b51dbf81 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index 02ebe80dc983..b2f6f8a6e4d2 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import org.threeten.bp.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.v3.oas.annotations.Operation; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java index 7081ba1a4304..b4f24ba29edf 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import org.threeten.bp.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.v3.oas.annotations.Operation; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java index 28441b7e8515..b9a9da62ae53 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApiController.java index 97a3ec705b7b..197fca8ae629 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApiController.java @@ -2,7 +2,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java index a82f33264d64..708a8b392c57 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java @@ -7,7 +7,6 @@ import java.math.BigDecimal; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; @@ -51,7 +50,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -232,7 +231,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -243,11 +242,11 @@ public FormatTest binary(Resource binary) { */ @Valid @Schema(name = "binary", required = false) - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 8f17228b6a26..4506c9592dd1 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.v3.oas.annotations.Operation; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index 3796fc00ce58..03f67c302ce9 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index ccc4a0d30157..a77caa14f045 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java index 9c616c14aaa8..8ecf827b36ce 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -2,7 +2,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java index 0c14e2c93c1b..6790fc82a0ba 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java @@ -9,7 +9,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -53,7 +52,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -234,7 +233,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -245,11 +244,11 @@ public FormatTest binary(Resource binary) { */ @Valid @Schema(name = "binary", required = false) - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 9bc3c924c700..d734154ae6c1 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.v3.oas.annotations.Operation; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index b44b240e3c38..9784647575d3 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java index 0c14e2c93c1b..6790fc82a0ba 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java @@ -9,7 +9,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -53,7 +52,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -234,7 +233,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -245,11 +244,11 @@ public FormatTest binary(Resource binary) { */ @Valid @Schema(name = "binary", required = false) - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index e0ac539a024c..cf5567df8fa5 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.v3.oas.annotations.Operation; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java index 0193067433b9..8a91326998aa 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java index 09c88088125d..e53687474afd 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java index b4c51ede9184..7d702440d739 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -2,7 +2,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java index 0c14e2c93c1b..6790fc82a0ba 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java @@ -9,7 +9,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -53,7 +52,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -234,7 +233,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -245,11 +244,11 @@ public FormatTest binary(Resource binary) { */ @Valid @Schema(name = "binary", required = false) - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index f34a5b0d2b79..9dd992bfe39d 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.v3.oas.annotations.Operation; diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java index 5f049169a647..2d9139f575bf 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java index 0c14e2c93c1b..6790fc82a0ba 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java @@ -9,7 +9,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -53,7 +52,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -234,7 +233,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -245,11 +244,11 @@ public FormatTest binary(Resource binary) { */ @Valid @Schema(name = "binary", required = false) - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index f27571c387be..8c14b51dbf81 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java index 8b5f909ae5ce..8c1fb519b30a 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java index 053fc844b0d1..8e1bc13822a4 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java index 91d370eeb058..c38fd7cc1104 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java @@ -11,7 +11,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -54,7 +53,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -235,7 +234,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -246,11 +245,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java index 8c4c84d27003..f9a5fa7b8b7d 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import java.util.Map; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java index 90ce18382beb..b01403490d02 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java index 63af72a20e4c..5091a8fa01f3 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java @@ -11,7 +11,6 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -54,7 +53,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -235,7 +234,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -246,11 +245,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index f63a9141189c..ee9b968c0ff1 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java index 90ce18382beb..b01403490d02 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/FormatTest.java index e37ca0109135..45f1d105c802 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/model/FormatTest.java @@ -11,7 +11,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import java.time.OffsetDateTime; import javax.validation.Valid; @@ -53,7 +52,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -234,7 +233,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -245,11 +244,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index 2bc50f00c65b..635d55b3812c 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 294576ae0454..16933925815c 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.data.domain.Pageable; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java index 91d370eeb058..c38fd7cc1104 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java @@ -11,7 +11,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -54,7 +53,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -235,7 +234,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -246,11 +245,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java index f63a9141189c..ee9b968c0ff1 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java index 90ce18382beb..b01403490d02 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; 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 index 0964a16e87c9..d9b412be1a2a 100644 --- 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 @@ -11,7 +11,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -56,7 +55,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -237,7 +236,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -248,11 +247,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index b14b9f6fecad..dd66ee2cc569 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import org.threeten.bp.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java index 4bac5c6a4d42..af7c65420e5e 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import org.threeten.bp.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java index c32bead44069..31cb57385b77 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApiController.java index 8c66ba7d8b56..8b859e266f70 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApiController.java @@ -2,7 +2,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java index 063aed84e30d..5d6a57b69a1c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java @@ -9,7 +9,6 @@ import java.math.BigDecimal; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; @@ -52,7 +51,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -233,7 +232,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -244,11 +243,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index f63a9141189c..ee9b968c0ff1 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java index 90ce18382beb..b01403490d02 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java index 91d370eeb058..c38fd7cc1104 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java @@ -11,7 +11,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -54,7 +53,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -235,7 +234,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -246,11 +245,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index 960fdd4fbb22..88dc22636c8b 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java index 3796fc00ce58..03f67c302ce9 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java index 289e898a6831..75abe3ff422f 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java index 9c616c14aaa8..8ecf827b36ce 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -2,7 +2,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java index 91d370eeb058..c38fd7cc1104 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java @@ -11,7 +11,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -54,7 +53,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -235,7 +234,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -246,11 +245,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 960fdd4fbb22..88dc22636c8b 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index 3796fc00ce58..03f67c302ce9 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index 289e898a6831..75abe3ff422f 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java index 9c616c14aaa8..8ecf827b36ce 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -2,7 +2,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java index 91d370eeb058..c38fd7cc1104 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java @@ -11,7 +11,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -54,7 +53,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -235,7 +234,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -246,11 +245,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 037a13dee307..8fb68265f627 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index 19270de6e6e6..ef28d4cf910b 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java index 91d370eeb058..c38fd7cc1104 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java @@ -11,7 +11,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -54,7 +53,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -235,7 +234,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -246,11 +245,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index 61bd43b6a67f..efbce89bf305 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -15,7 +15,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java index f6d86d18abc0..9571f3da3eb7 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -10,7 +10,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java index 21c34a69aea3..81fdd3e842c8 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -8,7 +8,6 @@ import springfox.documentation.annotations.ApiIgnore; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java index abdf3efc6215..6a256a8fb48f 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -3,7 +3,6 @@ import springfox.documentation.annotations.ApiIgnore; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java index 91d370eeb058..c38fd7cc1104 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java @@ -11,7 +11,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -54,7 +53,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -235,7 +234,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -246,11 +245,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java index df8e22923773..3c0d3aa6623a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import org.threeten.bp.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiController.java index a9830bcc6483..72efadd118c2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import org.threeten.bp.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java index 717b8a75310b..a7da41b192be 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import org.threeten.bp.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.ResponseEntity; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java index 9cf42e2e281c..0b800e906bbb 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.data.domain.Pageable; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiController.java index 78913cd2534a..5e95ed20be2d 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiController.java @@ -4,7 +4,6 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.data.domain.Pageable; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiDelegate.java index 2537ce30da04..7047f8a6a5ac 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -4,7 +4,6 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.data.domain.Pageable; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java index d44579f78f94..a8afa8fc0946 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java @@ -9,7 +9,6 @@ import java.math.BigDecimal; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; @@ -53,7 +52,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -234,7 +233,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -245,11 +244,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java index 7dee6868f6e4..166af3a8ed25 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java index b8e9dd88d450..397c677c9949 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java index 84d8d7bb47b2..2532e3d6823b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.data.domain.Pageable; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiDelegate.java index 2fa88df6b0cf..daf113aec6c5 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -4,7 +4,6 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.data.domain.Pageable; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java index 91d370eeb058..c38fd7cc1104 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java @@ -11,7 +11,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -54,7 +53,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -235,7 +234,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -246,11 +245,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java index df8e22923773..3c0d3aa6623a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import org.threeten.bp.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApiController.java index 848fe0e982f8..b20266d1f871 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApiController.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import org.threeten.bp.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java index 9cf42e2e281c..0b800e906bbb 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.data.domain.Pageable; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApiController.java index 8e3fd4cebffc..7c7fc3eb66a7 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApiController.java @@ -4,7 +4,6 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.data.domain.Pageable; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java index d44579f78f94..a8afa8fc0946 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java @@ -9,7 +9,6 @@ import java.math.BigDecimal; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; @@ -53,7 +52,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -234,7 +233,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -245,11 +244,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index 2bc50f00c65b..635d55b3812c 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 294576ae0454..16933925815c 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -9,7 +9,6 @@ import org.openapitools.model.ModelApiResponse; import org.springframework.data.domain.Pageable; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java index 91d370eeb058..c38fd7cc1104 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java @@ -11,7 +11,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -54,7 +53,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -235,7 +234,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -246,11 +245,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index b558d892cbb1..a15bc59fdcab 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java index 559dc219a4fe..81c7b3337c3a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java index 91d370eeb058..c38fd7cc1104 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java @@ -11,7 +11,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -54,7 +53,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -235,7 +234,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -246,11 +245,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index 3c59680b33c8..ffc492b9aa8c 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.virtualan.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.virtualan.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.virtualan.model.User; import org.openapitools.virtualan.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java index ed063f0a8b72..1851af5207d4 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.virtualan.model.ModelApiResponse; import org.openapitools.virtualan.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.annotations.*; import io.virtualan.annotation.ApiVirtual; diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java index 7495eb4765bc..2baa6041b19d 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java @@ -11,7 +11,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -54,7 +53,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -235,7 +234,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -246,11 +245,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java index f63a9141189c..ee9b968c0ff1 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java @@ -14,7 +14,6 @@ import org.openapitools.model.ModelApiResponse; import java.time.OffsetDateTime; import org.openapitools.model.OuterComposite; -import org.springframework.core.io.Resource; import org.openapitools.model.User; import org.openapitools.model.XmlItem; import io.swagger.annotations.*; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index 90ce18382beb..b01403490d02 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -7,7 +7,6 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import org.springframework.core.io.Resource; import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java index 91d370eeb058..c38fd7cc1104 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java @@ -11,7 +11,6 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.UUID; -import org.springframework.core.io.Resource; import org.springframework.format.annotation.DateTimeFormat; import org.openapitools.jackson.nullable.JsonNullable; import java.time.OffsetDateTime; @@ -54,7 +53,7 @@ public class FormatTest { private byte[] _byte; @JsonProperty("binary") - private Resource binary; + private org.springframework.core.io.Resource binary; @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @@ -235,7 +234,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(Resource binary) { + public FormatTest binary(org.springframework.core.io.Resource binary) { this.binary = binary; return this; } @@ -246,11 +245,11 @@ public FormatTest binary(Resource binary) { */ @Valid @ApiModelProperty(value = "") - public Resource getBinary() { + public org.springframework.core.io.Resource getBinary() { return binary; } - public void setBinary(Resource binary) { + public void setBinary(org.springframework.core.io.Resource binary) { this.binary = binary; }