From 63cf4109c796eeb15893aa4f1a9b9965032620f8 Mon Sep 17 00:00:00 2001 From: Oleh Kurpiak Date: Tue, 14 Mar 2023 10:14:05 +0200 Subject: [PATCH] [Java][Spring] option whether to generate required args constructor --- bin/configs/spring-cloud-oas3-fakeapi.yaml | 1 + bin/configs/spring-http-interface.yaml | 1 + docs/generators/java-camel.md | 1 + docs/generators/spring.md | 1 + .../codegen/languages/SpringCodegen.java | 10 +++++++++ .../main/resources/JavaSpring/pojo.mustache | 2 ++ .../org/openapitools/model/AnimalDto.java | 16 -------------- .../org/openapitools/model/BigCatDto.java | 16 -------------- .../java/org/openapitools/model/CatDto.java | 16 -------------- .../org/openapitools/model/CategoryDto.java | 16 -------------- .../java/org/openapitools/model/DogDto.java | 16 -------------- .../org/openapitools/model/EnumTestDto.java | 16 -------------- .../org/openapitools/model/FormatTestDto.java | 19 ----------------- .../java/org/openapitools/model/NameDto.java | 16 -------------- .../java/org/openapitools/model/PetDto.java | 17 --------------- .../model/TypeHolderDefaultDto.java | 20 ------------------ .../model/TypeHolderExampleDto.java | 21 ------------------- .../java/org/openapitools/model/Animal.java | 16 -------------- .../java/org/openapitools/model/BigCat.java | 16 -------------- .../main/java/org/openapitools/model/Cat.java | 16 -------------- .../java/org/openapitools/model/Category.java | 16 -------------- .../main/java/org/openapitools/model/Dog.java | 16 -------------- .../java/org/openapitools/model/EnumTest.java | 16 -------------- .../org/openapitools/model/FormatTest.java | 19 ----------------- .../java/org/openapitools/model/Name.java | 16 -------------- .../main/java/org/openapitools/model/Pet.java | 17 --------------- .../openapitools/model/TypeHolderDefault.java | 20 ------------------ .../openapitools/model/TypeHolderExample.java | 21 ------------------- 28 files changed, 16 insertions(+), 378 deletions(-) diff --git a/bin/configs/spring-cloud-oas3-fakeapi.yaml b/bin/configs/spring-cloud-oas3-fakeapi.yaml index 3f4e3c8ba3a3..5d919d03f24f 100644 --- a/bin/configs/spring-cloud-oas3-fakeapi.yaml +++ b/bin/configs/spring-cloud-oas3-fakeapi.yaml @@ -10,3 +10,4 @@ additionalProperties: interfaceOnly: "true" singleContentTypes: "true" hideGenerationTimestamp: "true" + generatedConstructorWithRequiredArgs: "false" diff --git a/bin/configs/spring-http-interface.yaml b/bin/configs/spring-http-interface.yaml index a5cf6c2d7cc9..9c92a629592c 100644 --- a/bin/configs/spring-http-interface.yaml +++ b/bin/configs/spring-http-interface.yaml @@ -8,3 +8,4 @@ additionalProperties: snapshotVersion: "true" hideGenerationTimestamp: "true" modelNameSuffix: 'Dto' + generatedConstructorWithRequiredArgs: "false" diff --git a/docs/generators/java-camel.md b/docs/generators/java-camel.md index f61b5630e830..394bf13dd548 100644 --- a/docs/generators/java-camel.md +++ b/docs/generators/java-camel.md @@ -56,6 +56,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
**false**
No changes to the enum's are made, this is the default option.
**true**
With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
|false| |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false| +|generatedConstructorWithRequiredArgs|Whether to generate constructors with required args for models| |true| |groupId|groupId in generated pom.xml| |org.openapitools| |hateoas|Use Spring HATEOAS library to allow adding HATEOAS links| |false| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false| diff --git a/docs/generators/spring.md b/docs/generators/spring.md index c7380546a788..e8bfdbc0e04b 100644 --- a/docs/generators/spring.md +++ b/docs/generators/spring.md @@ -49,6 +49,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
**false**
No changes to the enum's are made, this is the default option.
**true**
With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
|false| |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false| +|generatedConstructorWithRequiredArgs|Whether to generate constructors with required args for models| |true| |groupId|groupId in generated pom.xml| |org.openapitools| |hateoas|Use Spring HATEOAS library to allow adding HATEOAS links| |false| |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false| 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 6f4ba5b519eb..2c909e8c8d66 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 @@ -96,6 +96,7 @@ public class SpringCodegen extends AbstractJavaCodegen public static final String SINGLE_CONTENT_TYPES = "singleContentTypes"; public static final String VIRTUAL_SERVICE = "virtualService"; public static final String SKIP_DEFAULT_INTERFACE = "skipDefaultInterface"; + public static final String GENERATE_CONSTRUCTOR_WITH_REQUIRED_ARGS = "generatedConstructorWithRequiredArgs"; public static final String ASYNC = "async"; public static final String REACTIVE = "reactive"; @@ -157,6 +158,7 @@ public String getDescription() { protected boolean useSpringController = false; protected boolean useSwaggerUI = true; protected boolean useSpringBoot3 = false; + protected boolean generatedConstructorWithRequiredArgs = true; protected RequestMappingMode requestMappingMode = RequestMappingMode.controller; public SpringCodegen() { @@ -248,6 +250,9 @@ public SpringCodegen() { cliOptions.add(CliOption.newBoolean(USE_SPRING_BOOT3, "Generate code and provide dependencies for use with Spring Boot 3.x. (Use jakarta instead of javax in imports). Enabling this option will also enable `useJakartaEe`.", useSpringBoot3)); + cliOptions.add(CliOption.newBoolean(GENERATE_CONSTRUCTOR_WITH_REQUIRED_ARGS, + "Whether to generate constructors with required args for models", + generatedConstructorWithRequiredArgs)); supportedLibraries.put(SPRING_BOOT, "Spring-boot Server application."); supportedLibraries.put(SPRING_CLOUD_LIBRARY, @@ -457,6 +462,11 @@ public void processOpts() { } writePropertyBack(SPRING_CONTROLLER, useSpringController); + if (additionalProperties.containsKey(GENERATE_CONSTRUCTOR_WITH_REQUIRED_ARGS)) { + this.generatedConstructorWithRequiredArgs = convertPropertyToBoolean(GENERATE_CONSTRUCTOR_WITH_REQUIRED_ARGS); + } + writePropertyBack(GENERATE_CONSTRUCTOR_WITH_REQUIRED_ARGS, generatedConstructorWithRequiredArgs); + if (additionalProperties.containsKey(RETURN_SUCCESS_CODE)) { this.setReturnSuccessCode(Boolean.parseBoolean(additionalProperties.get(RETURN_SUCCESS_CODE).toString())); } diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 45c9c96dcd44..5d1e340e7542 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -80,6 +80,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{/openApiNullable}} {{/isContainer}} {{/vars}} + {{#generatedConstructorWithRequiredArgs}} {{#hasRequired}} /** @@ -110,6 +111,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{/vars}} } {{/hasRequired}} + {{/generatedConstructorWithRequiredArgs}} {{#vars}} {{! begin feature: fluent setter methods }} diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java index 98943e769c29..c17b0385407e 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java @@ -43,22 +43,6 @@ public class AnimalDto { @JsonProperty("color") private String color = "red"; - /** - * Default constructor - * @deprecated Use {@link AnimalDto#AnimalDto(String)} - */ - @Deprecated - public AnimalDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public AnimalDto(String className) { - this.className = className; - } - public AnimalDto className(String className) { this.className = className; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java index 6608ecfa7a4d..4277020c8dca 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java @@ -69,22 +69,6 @@ public static KindEnum fromValue(String value) { @JsonProperty("kind") private KindEnum kind; - /** - * Default constructor - * @deprecated Use {@link BigCatDto#BigCatDto(String)} - */ - @Deprecated - public BigCatDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public BigCatDto(String className) { - super(className); - } - public BigCatDto kind(KindEnum kind) { this.kind = kind; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java index c350847bb898..61f8bc958e63 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java @@ -37,22 +37,6 @@ public class CatDto extends AnimalDto { @JsonProperty("declawed") private Boolean declawed; - /** - * Default constructor - * @deprecated Use {@link CatDto#CatDto(String)} - */ - @Deprecated - public CatDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public CatDto(String className) { - super(className); - } - public CatDto declawed(Boolean declawed) { this.declawed = declawed; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java index 5936031e79c7..b3aebedbe87d 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java @@ -27,22 +27,6 @@ public class CategoryDto { @JsonProperty("name") private String name = "default-name"; - /** - * Default constructor - * @deprecated Use {@link CategoryDto#CategoryDto(String)} - */ - @Deprecated - public CategoryDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public CategoryDto(String name) { - this.name = name; - } - public CategoryDto id(Long id) { this.id = id; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java index 19f8d6d95c6a..3cd4ba41e445 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java @@ -29,22 +29,6 @@ public class DogDto extends AnimalDto { @JsonProperty("breed") private String breed; - /** - * Default constructor - * @deprecated Use {@link DogDto#DogDto(String)} - */ - @Deprecated - public DogDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public DogDto(String className) { - super(className); - } - public DogDto breed(String breed) { this.breed = breed; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java index f825319a573a..f799473c14f3 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java @@ -182,22 +182,6 @@ public static EnumNumberEnum fromValue(Double value) { @JsonProperty("outerEnum") private OuterEnumDto outerEnum; - /** - * Default constructor - * @deprecated Use {@link EnumTestDto#EnumTestDto(EnumStringRequiredEnum)} - */ - @Deprecated - public EnumTestDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public EnumTestDto(EnumStringRequiredEnum enumStringRequired) { - this.enumStringRequired = enumStringRequired; - } - public EnumTestDto enumString(EnumStringEnum enumString) { this.enumString = enumString; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java index 77f950cdef4b..c3f24d344c51 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java @@ -71,25 +71,6 @@ public class FormatTestDto { @JsonProperty("BigDecimal") private BigDecimal bigDecimal; - /** - * Default constructor - * @deprecated Use {@link FormatTestDto#FormatTestDto(BigDecimal, byte[], LocalDate, String)} - */ - @Deprecated - public FormatTestDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public FormatTestDto(BigDecimal number, byte[] _byte, LocalDate date, String password) { - this.number = number; - this._byte = _byte; - this.date = date; - this.password = password; - } - public FormatTestDto integer(Integer integer) { this.integer = integer; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java index ba75b859251c..d560dd759ec0 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java @@ -33,22 +33,6 @@ public class NameDto { @JsonProperty("123Number") private Integer _123number; - /** - * Default constructor - * @deprecated Use {@link NameDto#NameDto(Integer)} - */ - @Deprecated - public NameDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public NameDto(Integer name) { - this.name = name; - } - public NameDto name(Integer name) { this.name = name; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java index 95ec99c34d54..4cb331580866 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java @@ -86,23 +86,6 @@ public static StatusEnum fromValue(String value) { @JsonProperty("status") private StatusEnum status; - /** - * Default constructor - * @deprecated Use {@link PetDto#PetDto(String, Set)} - */ - @Deprecated - public PetDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public PetDto(String name, Set photoUrls) { - this.name = name; - this.photoUrls = photoUrls; - } - public PetDto id(Long id) { this.id = id; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java index 70b2a2cebacf..37047d9a2e28 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java @@ -40,26 +40,6 @@ public class TypeHolderDefaultDto { private List arrayItem = new ArrayList<>(); - /** - * Default constructor - * @deprecated Use {@link TypeHolderDefaultDto#TypeHolderDefaultDto(String, BigDecimal, Integer, Boolean, List)} - */ - @Deprecated - public TypeHolderDefaultDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public TypeHolderDefaultDto(String stringItem, BigDecimal numberItem, Integer integerItem, Boolean boolItem, List arrayItem) { - this.stringItem = stringItem; - this.numberItem = numberItem; - this.integerItem = integerItem; - this.boolItem = boolItem; - this.arrayItem = arrayItem; - } - public TypeHolderDefaultDto stringItem(String stringItem) { this.stringItem = stringItem; return this; diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java index 31e61fbd0e65..6ca0eb07b4e1 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java @@ -43,27 +43,6 @@ public class TypeHolderExampleDto { private List arrayItem = new ArrayList<>(); - /** - * Default constructor - * @deprecated Use {@link TypeHolderExampleDto#TypeHolderExampleDto(String, BigDecimal, Float, Integer, Boolean, List)} - */ - @Deprecated - public TypeHolderExampleDto() { - super(); - } - - /** - * Constructor with only required parameters - */ - public TypeHolderExampleDto(String stringItem, BigDecimal numberItem, Float floatItem, Integer integerItem, Boolean boolItem, List arrayItem) { - this.stringItem = stringItem; - this.numberItem = numberItem; - this.floatItem = floatItem; - this.integerItem = integerItem; - this.boolItem = boolItem; - this.arrayItem = arrayItem; - } - public TypeHolderExampleDto stringItem(String stringItem) { this.stringItem = stringItem; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java index 1ecf10efc5c1..079192f597a2 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java @@ -44,22 +44,6 @@ public class Animal { @JsonProperty("color") private String color = "red"; - /** - * Default constructor - * @deprecated Use {@link Animal#Animal(String)} - */ - @Deprecated - public Animal() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Animal(String className) { - this.className = className; - } - public Animal className(String className) { this.className = className; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java index 8c5453c4a5b0..1b367854915c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java @@ -69,22 +69,6 @@ public static KindEnum fromValue(String value) { @JsonProperty("kind") private KindEnum kind; - /** - * Default constructor - * @deprecated Use {@link BigCat#BigCat(String)} - */ - @Deprecated - public BigCat() { - super(); - } - - /** - * Constructor with only required parameters - */ - public BigCat(String className) { - super(className); - } - public BigCat kind(KindEnum kind) { this.kind = kind; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java index a2feece8de89..41d9863046f1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java @@ -38,22 +38,6 @@ public class Cat extends Animal { @JsonProperty("declawed") private Boolean declawed; - /** - * Default constructor - * @deprecated Use {@link Cat#Cat(String)} - */ - @Deprecated - public Cat() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Cat(String className) { - super(className); - } - public Cat declawed(Boolean declawed) { this.declawed = declawed; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java index 7ee1fde06461..980faf6cbc2e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java @@ -27,22 +27,6 @@ public class Category { @JsonProperty("name") private String name = "default-name"; - /** - * Default constructor - * @deprecated Use {@link Category#Category(String)} - */ - @Deprecated - public Category() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Category(String name) { - this.name = name; - } - public Category id(Long id) { this.id = id; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java index 1bb3d6b51028..e39fe3fdab2c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java @@ -29,22 +29,6 @@ public class Dog extends Animal { @JsonProperty("breed") private String breed; - /** - * Default constructor - * @deprecated Use {@link Dog#Dog(String)} - */ - @Deprecated - public Dog() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Dog(String className) { - super(className); - } - public Dog breed(String breed) { this.breed = breed; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java index 6f08d4ee9fb3..a92050b09f5d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java @@ -184,22 +184,6 @@ public static EnumNumberEnum fromValue(Double value) { @JsonProperty("outerEnum") private OuterEnum outerEnum; - /** - * Default constructor - * @deprecated Use {@link EnumTest#EnumTest(EnumStringRequiredEnum)} - */ - @Deprecated - public EnumTest() { - super(); - } - - /** - * Constructor with only required parameters - */ - public EnumTest(EnumStringRequiredEnum enumStringRequired) { - this.enumStringRequired = enumStringRequired; - } - public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; return this; 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 06e9dde8e89d..23130acbb766 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 @@ -73,25 +73,6 @@ public class FormatTest { @JsonProperty("BigDecimal") private BigDecimal bigDecimal; - /** - * Default constructor - * @deprecated Use {@link FormatTest#FormatTest(BigDecimal, byte[], LocalDate, String)} - */ - @Deprecated - public FormatTest() { - super(); - } - - /** - * Constructor with only required parameters - */ - public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) { - this.number = number; - this._byte = _byte; - this.date = date; - this.password = password; - } - public FormatTest integer(Integer integer) { this.integer = integer; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java index d6dcb665651a..708b0b90b016 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java @@ -34,22 +34,6 @@ public class Name { @JsonProperty("123Number") private Integer _123number; - /** - * Default constructor - * @deprecated Use {@link Name#Name(Integer)} - */ - @Deprecated - public Name() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Name(Integer name) { - this.name = name; - } - public Name name(Integer name) { this.name = name; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java index 6adaaba97d76..acb7ce6b37b3 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java @@ -86,23 +86,6 @@ public static StatusEnum fromValue(String value) { @JsonProperty("status") private StatusEnum status; - /** - * Default constructor - * @deprecated Use {@link Pet#Pet(String, Set)} - */ - @Deprecated - public Pet() { - super(); - } - - /** - * Constructor with only required parameters - */ - public Pet(String name, Set photoUrls) { - this.name = name; - this.photoUrls = photoUrls; - } - public Pet id(Long id) { this.id = id; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java index 67ef036857d1..e37caaf5784c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -40,26 +40,6 @@ public class TypeHolderDefault { @Valid private List arrayItem = new ArrayList<>(); - /** - * Default constructor - * @deprecated Use {@link TypeHolderDefault#TypeHolderDefault(String, BigDecimal, Integer, Boolean, List)} - */ - @Deprecated - public TypeHolderDefault() { - super(); - } - - /** - * Constructor with only required parameters - */ - public TypeHolderDefault(String stringItem, BigDecimal numberItem, Integer integerItem, Boolean boolItem, List arrayItem) { - this.stringItem = stringItem; - this.numberItem = numberItem; - this.integerItem = integerItem; - this.boolItem = boolItem; - this.arrayItem = arrayItem; - } - public TypeHolderDefault stringItem(String stringItem) { this.stringItem = stringItem; return this; diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java index 5b77bee14c17..c821c0257d20 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -43,27 +43,6 @@ public class TypeHolderExample { @Valid private List arrayItem = new ArrayList<>(); - /** - * Default constructor - * @deprecated Use {@link TypeHolderExample#TypeHolderExample(String, BigDecimal, Float, Integer, Boolean, List)} - */ - @Deprecated - public TypeHolderExample() { - super(); - } - - /** - * Constructor with only required parameters - */ - public TypeHolderExample(String stringItem, BigDecimal numberItem, Float floatItem, Integer integerItem, Boolean boolItem, List arrayItem) { - this.stringItem = stringItem; - this.numberItem = numberItem; - this.floatItem = floatItem; - this.integerItem = integerItem; - this.boolItem = boolItem; - this.arrayItem = arrayItem; - } - public TypeHolderExample stringItem(String stringItem) { this.stringItem = stringItem; return this;